From 51cf70467dfbcca5fbce7f25761678dd8b487d4e Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Sat, 9 May 2009 10:25:10 +0000 Subject: Integrated P.E.Op.S OpenGL plugin into the build tree (still does NOT work on x86_64) git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@23342 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfOpenGL/GPU.c | 9 ++++----- plugins/dfOpenGL/Makefile.am | 8 ++++---- plugins/dfOpenGL/Makefile.in | 35 ++++++++++++++++++----------------- 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'plugins/dfOpenGL') diff --git a/plugins/dfOpenGL/GPU.c b/plugins/dfOpenGL/GPU.c index 4776f47b..8546a02c 100644 --- a/plugins/dfOpenGL/GPU.c +++ b/plugins/dfOpenGL/GPU.c @@ -9,7 +9,7 @@ #include "gpu_i.h" #include "primitive_drawing.h" #include "cfg.h" -#include "PSEmu_PlugIn_Defs.h" +#include "psemu_plugin_defs.h" #include @@ -21,17 +21,16 @@ const unsigned char version = PLUGIN_VERSION; // do not touch - library for PSEm // it is up to developer but values must be in range 0-255 -const unsigned char revision = 1; -const unsigned char build = 0; +const unsigned char revision = 1; +const unsigned char build = 0; // to obtain library name for your plugin, mail: plugin@psemu.com // this must be unique, and only we can provide this -static char *libraryName = "PCSX-df OpenGL Plugin"; +static char *libraryName = "PCSX-df OpenGL Driver"; float scalarDispWidth,scalarDispHeight; float scalarDrawWidth,scalarDrawHeight; - // driver dependant variables GpuConfS gpuConfig; diff --git a/plugins/dfOpenGL/Makefile.am b/plugins/dfOpenGL/Makefile.am index 7bf6b441..c6610749 100644 --- a/plugins/dfOpenGL/Makefile.am +++ b/plugins/dfOpenGL/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ - -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DLOCALE_DIR=\"${datadir}/locale/\" \ + -DDATADIR=\"${datadir}/psemu/\" \ $(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \ - -g -O0 -Wall -fPIC + -I../../libpcsxcore -g -O0 -Wall -fPIC bindir = @libdir@/games/psemu/ libdir = @libdir@/games/psemu/ @@ -10,7 +10,7 @@ libdir = @libdir@/games/psemu/ lib_LTLIBRARIES = libdfOpenGL.la libdfOpenGL_la_SOURCES = GPU.c primitive_drawing.c fps.c gllog.c cfg.c -libdfOpenGL_la_LDFLAGS = -module -avoid-version -L/usr/lib \ +libdfOpenGL_la_LDFLAGS = -module -avoid-version \ -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXxf86vm -lGL -lm bin_PROGRAMS = cfgDFOpenGL diff --git a/plugins/dfOpenGL/Makefile.in b/plugins/dfOpenGL/Makefile.in index a3c04976..7ac8dd51 100644 --- a/plugins/dfOpenGL/Makefile.in +++ b/plugins/dfOpenGL/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -103,23 +103,18 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DFOPENGL = @DFOPENGL@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADE2_CFLAGS = @GLADE2_CFLAGS@ @@ -138,12 +133,14 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -155,8 +152,12 @@ 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@ @@ -181,8 +182,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -213,6 +213,7 @@ libdir = @libdir@/games/psemu/ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -233,14 +234,14 @@ 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/\" \ + -DLOCALE_DIR=\"${datadir}/locale/\" \ + -DDATADIR=\"${datadir}/psemu/\" \ $(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \ - -g -O0 -Wall -fPIC + -I../../libpcsxcore -g -O0 -Wall -fPIC lib_LTLIBRARIES = libdfOpenGL.la libdfOpenGL_la_SOURCES = GPU.c primitive_drawing.c fps.c gllog.c cfg.c -libdfOpenGL_la_LDFLAGS = -module -avoid-version -L/usr/lib \ +libdfOpenGL_la_LDFLAGS = -module -avoid-version \ -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXxf86vm -lGL -lm cfgDFOpenGL_SOURCES = gpucfg-0.1df/main.c @@ -256,8 +257,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -418,7 +419,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS -- cgit v1.2.3