ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugins: Fix the dialog boxes on FWnull & USBnull so the buttons work. Fix inconsistant version numbers. Delete a stray file. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1121 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-02 14:14:34 +00:00
parent 92ac589187
commit 74ebe985f6
10 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/CDVDiso/src/Windows/svnrev.h
View File

@ -1,18 +0,0 @@
// svnrev_template.h --> svnrev.h
//
// This file acts as a template for the automatic SVN revision/version tag.
// It is used by the utility SubWCrev.exe to create an "svnrev.h" file for
// whichever project is being compiled (as indicated by command line options
// passed to SubWCRev.exe during the project's pre-build step).
//
// The SubWCRev.exe utility is part of TortoiseSVN and requires several DLLs
// installed by TortoiseSVN, so it will only be available if you have TortoiseSVN
// installed on your system. If you do not have it installed, a generic template
// is used instead (see svnrev_generic.h). Having TortoiseSVN is handy but not
// necessary. If you do not have it installed, everything will still compile
// fine except without the SVN revision tagged to the application/dll version.
//
// TortoiseSVN can be downloaded from http://tortoisesvn.tigris.org
#define SVN_REV 798
#define SVN_MODS 1

10
plugins/FWnull/Linux/Config.cpp
View File

@ -29,12 +29,18 @@ using namespace std;
#include "FW.h" #include "FW.h"
#include "Config.h" #include "Config.h"
#ifdef __cplusplus
extern "C" extern "C"
{ {
#include "interface.h" #endif
#include "support.h" #include "support.h"
//#include "callbacks.h" #include "callbacks.h"
#include "interface.h"
#ifdef __cplusplus
} }
#endif
GtkWidget *MsgDlg, *About, *Conf; GtkWidget *MsgDlg, *About, *Conf;
extern string s_strIniPath; extern string s_strIniPath;

3
plugins/FWnull/Makefile.am
View File

@ -28,6 +28,7 @@ FW.h Linux/Config.h Linux/Linux.h
libFWnull_a_SOURCES += \ libFWnull_a_SOURCES += \
Linux/interface.h Linux/support.c \ Linux/interface.h Linux/support.c \
Linux/interface.c Linux/support.h \ Linux/interface.c Linux/support.h \
Linux/callbacks.c Linux/callbacks.h Linux/callbacks.h
#Linux/callbacks.c
#SUBDIRS = Linux #SUBDIRS = Linux

7
plugins/FWnull/build.sh
View File

@ -29,9 +29,4 @@ fi
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
exit 1 exit 1
fi fi
if [ -s cfgFWnull ] && [ -s libFWnull.so ]
then
cp cfgFWnull libFWnull.so ${PCSX2PLUGINS}
fi

8
plugins/SPU2null/configure.ac
View File

@ -1,6 +1,6 @@
AC_INIT(SPU2null, 0.5,arcum42@gmail.com) AC_INIT(SPU2null, 0.71,arcum42@gmail.com)
AM_INIT_AUTOMAKE(SPU2null,0.8) AM_INIT_AUTOMAKE(SPU2null,0.71)
AC_PROG_CC([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) AC_PROG_CC([gcc g++ cl KCC CC cxx cc++ xlC aCC c++])
AC_PROG_CXX([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) AC_PROG_CXX([gcc g++ cl KCC CC cxx cc++ xlC aCC c++])
@ -13,8 +13,8 @@ dnl necessary for compiling assembly
AM_PROG_AS AM_PROG_AS
AC_SUBST(SPU2null_CURRENT, 0) AC_SUBST(SPU2null_CURRENT, 0)
AC_SUBST(SPU2null_REVISION, 8) AC_SUBST(SPU2null_REVISION, 7)
AC_SUBST(SPU2null_AGE, 0) AC_SUBST(SPU2null_AGE, 1)
AC_SUBST(SPU2null_RELEASE,[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE]) AC_SUBST(SPU2null_RELEASE,[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE])
AC_SUBST(SPU2null_SONAME,libSPU2null.so.[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE]) AC_SUBST(SPU2null_SONAME,libSPU2null.so.[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE])

10
plugins/USBnull/Linux/Config.cpp
View File

@ -26,12 +26,18 @@
#include <string> #include <string>
using namespace std; using namespace std;
#ifdef __cplusplus
extern "C" extern "C"
{ {
#include "interface.h" #endif
#include "support.h" #include "support.h"
//#include "callbacks.h" #include "callbacks.h"
#include "interface.h"
#ifdef __cplusplus
} }
#endif
#include "USB.h" #include "USB.h"

3
plugins/USBnull/Makefile.am
View File

@ -28,6 +28,7 @@ USB.h Linux/Config.h Linux/Linux.h
libUSBnull_a_SOURCES += \ libUSBnull_a_SOURCES += \
Linux/interface.h Linux/support.c \ Linux/interface.h Linux/support.c \
Linux/interface.c Linux/support.h \ Linux/interface.c Linux/support.h \
Linux/callbacks.c Linux/callbacks.h Linux/callbacks.h
#Linux/callbacks.c
#SUBDIRS = Linux #SUBDIRS = Linux

5
plugins/USBnull/build.sh
View File

@ -30,8 +30,3 @@ if [ $? -ne 0 ]
then then
exit 1 exit 1
fi fi
#if [ -s cfgFWnull ] && [ -s libUSBnull.so ]
#then
#cp cfgFWnull libFWnull.so ${PCSX2PLUGINS}
#fi

2
plugins/USBnull/configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT(USBnull, 0.5,arcum42@gmail.com) AC_INIT(USBnull, 0.6,arcum42@gmail.com)
AM_INIT_AUTOMAKE(USBnull,0.6) AM_INIT_AUTOMAKE(USBnull,0.6)

2
plugins/dev9null/configure.ac
View File

@ -13,7 +13,7 @@ dnl necessary for compiling assembly
AM_PROG_AS AM_PROG_AS
AC_SUBST(DEV9null_CURRENT, 0) AC_SUBST(DEV9null_CURRENT, 0)
AC_SUBST(DEV9null_REVISION, 8) AC_SUBST(DEV9null_REVISION, 4)
AC_SUBST(DEV9null_AGE, 0) AC_SUBST(DEV9null_AGE, 0)
AC_SUBST(DEV9null_RELEASE,[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE]) AC_SUBST(DEV9null_RELEASE,[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE])
AC_SUBST(DEV9null_SONAME,libDEV9null.so.[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE]) AC_SUBST(DEV9null_SONAME,libDEV9null.so.[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE])