diff options
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | INSTALL | 365 | ||||
| -rw-r--r-- | Makefile.am | 21 | ||||
| -rwxr-xr-x | autogen.sh | 17 | ||||
| -rw-r--r-- | configure.ac | 268 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gui/Makefile.am | 85 | ||||
| -rw-r--r-- | gui/data/Makefile.am | 7 | ||||
| -rw-r--r-- | gui/data/pixmaps/Makefile.am | 18 | ||||
| -rw-r--r-- | gui/po/CMakeLists.txt (renamed from po/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gui/po/es.po (renamed from po/es.po) | 0 | ||||
| -rw-r--r-- | gui/po/fr.po (renamed from po/fr.po) | 0 | ||||
| -rw-r--r-- | gui/po/hu.po (renamed from po/hu.po) | 0 | ||||
| -rw-r--r-- | gui/po/it.po (renamed from po/it.po) | 0 | ||||
| -rw-r--r-- | gui/po/ko_KR.po (renamed from po/ko_KR.po) | 0 | ||||
| -rw-r--r-- | gui/po/pcsxr.pot (renamed from po/pcsxr.pot) | 0 | ||||
| -rw-r--r-- | gui/po/pt_BR.po (renamed from po/pt_BR.po) | 0 | ||||
| -rw-r--r-- | gui/po/ru.po (renamed from po/ru.po) | 0 | ||||
| -rw-r--r-- | gui/po/zh_CN.po (renamed from po/zh_CN.po) | 0 | ||||
| -rw-r--r-- | gui/po/zh_TW.po (renamed from po/zh_TW.po) | 0 | ||||
| -rw-r--r-- | libpcsxcore/Makefile.am | 102 | ||||
| -rw-r--r-- | m4/ax_append_link_flags.m4 | 65 | ||||
| -rw-r--r-- | m4/ax_require_defined.m4 | 37 | ||||
| -rw-r--r-- | pcsxr.anjuta | 44 | ||||
| -rw-r--r-- | plugins/bladesio1/Makefile.am | 46 | ||||
| -rw-r--r-- | plugins/dfcdrom/Makefile.am | 61 | ||||
| -rw-r--r-- | plugins/dfinput/Makefile.am | 47 | ||||
| -rwxr-xr-x | plugins/dfnet/Makefile.am | 46 | ||||
| -rwxr-xr-x | plugins/dfsound/Makefile.am | 82 | ||||
| -rwxr-xr-x | plugins/dfxvideo/Makefile.am | 60 | ||||
| -rw-r--r-- | plugins/nullsio1/Makefile.am | 10 | ||||
| -rwxr-xr-x | plugins/peopsxgl/Makefile.am | 60 | ||||
| -rw-r--r-- | po/LINGUAS | 9 | ||||
| -rw-r--r-- | po/Makefile.in.in | 214 | ||||
| -rw-r--r-- | po/Makevars | 41 | ||||
| -rw-r--r-- | po/POTFILES.in | 103 | ||||
| -rwxr-xr-x | strip_fPIC.sh | 15 | ||||
| -rw-r--r--[-rwxr-xr-x] | win32/gui/pcsxr.bmp | bin | 283254 -> 455418 bytes |
40 files changed, 12 insertions, 1829 deletions
diff --git a/.travis.yml b/.travis.yml index c258b310..78964c05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ +os: linux + +dist: trusty + language: c + compiler: - clang - gcc @@ -8,13 +13,16 @@ addons: sources: - ubuntu-sdk-team packages: - - autoconf-archive - intltool + - libavformat-dev + - libavcodec-dev + - libavutil-dev - libgtk-3-dev - libsdl2-dev - libxtst-dev - libxml2-utils script: - - ./autogen.sh + - mkdir build && cd build + - cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' - make -j1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 190e90d7..2355cbf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(pcsxr) set(PCSXR_VERSION_MAJOR "1") set(PCSXR_VERSION_MINOR "9") -set(PCSXR_VERSION_PATCH "95") +set(PCSXR_VERSION_PATCH "94") add_definitions(-DPACKAGE_VERSION="${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}") add_definitions(-DPACKAGE_NAME="PCSXr") add_definitions(-DPACKAGE_STRING="PCSXr ${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}") @@ -46,7 +46,6 @@ if (BUILD_SIO1) endif() #components -add_subdirectory(po) add_subdirectory(libpcsxcore) add_subdirectory(gui) add_subdirectory(plugins) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 7d1c323b..00000000 --- a/INSTALL +++ /dev/null @@ -1,365 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - 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 -================== - - 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. 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 -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - 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. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - 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 - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 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 -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -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 `..'. 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 -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - 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', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - 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. 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'. - - 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 -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -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 -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./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 -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - 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 -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 82dc5c19..00000000 --- a/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = gui/data -SUBDIRS += doc -SUBDIRS += gui/data/pixmaps -SUBDIRS += po -SUBDIRS += libpcsxcore -SUBDIRS += gui -SUBDIRS += plugins/dfinput -SUBDIRS += plugins/dfsound -SUBDIRS += plugins/dfxvideo -SUBDIRS += plugins/dfcdrom -SUBDIRS += plugins/dfnet -SUBDIRS += plugins/nullsio1 - -SUBDIRS += $(BLADESIO1) -SUBDIRS += $(PEOPSXGL) - -DIST_SUBDIRS = $(SUBDIRS) plugins/bladesio1 plugins/peopsxgl - -EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df strip_fPIC.sh diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index ade33aa3..00000000 --- a/autogen.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -# Additional options go to configure. - -echo "Rebuilding ./configure with autoreconf..." -for dir in include m4; do - if [ ! -d "$dir" ]; then - mkdir "$dir" - fi -done -autoreconf -f -i -if [ $? -ne 0 ]; then - echo "autoreconf failed" - exit $? -fi - -./configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 76e62522..00000000 --- a/configure.ac +++ /dev/null @@ -1,268 +0,0 @@ -AC_INIT([pcsxr], [1.9.95]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CANONICAL_HOST -AC_CANONICAL_BUILD -AM_INIT_AUTOMAKE(foreign subdir-objects) -AM_MAINTAINER_MODE - -AC_CONFIG_HEADERS([include/config.h:include/config.h.in]) - -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_STDC_HEADERS -AM_PROG_AS - -LT_PREREQ([2.2.6]) -LT_INIT([disable-static]) - -AX_APPEND_COMPILE_FLAGS([-std=gnu99]) -AX_APPEND_LINK_FLAGS([-fno-pie]) -AX_COMPILER_VENDOR -if test "$ax_cv_c_compiler_vendor" = "gnu"; then - AX_CHECK_LINK_FLAG([-no-pie],[AX_APPEND_LINK_FLAGS([-no-pie])],) - AX_CHECK_LINK_FLAG([-nopie],[AX_APPEND_LINK_FLAGS([-nopie])],) -fi - -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 >= 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!])) - -PKG_CHECK_MODULES([SDL2], [sdl2 >= 2.0.0], - [AC_DEFINE([HAVE_SDL2], [1], [Use SDL2])], - [PKG_CHECK_MODULES([SDL], [sdl >= 1.2.12], - [AC_DEFINE([HAVE_SDL], [1], [Use SDL]) - ], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!])) -]) - -AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) -AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) - -AC_SUBST(GLIB2_CFLAGS) -AC_SUBST(GLIB2_LIBS) -AC_SUBST(GTK3_CFLAGS) -AC_SUBST(GTK3_LIBS) - -AC_CONFIG_FILES([Makefile -gui/data/Makefile -doc/Makefile -libpcsxcore/Makefile -gui/Makefile -plugins/bladesio1/Makefile -plugins/nullsio1/Makefile -plugins/dfinput/Makefile -plugins/dfsound/Makefile -plugins/dfxvideo/Makefile -plugins/dfcdrom/Makefile -plugins/dfnet/Makefile -plugins/peopsxgl/Makefile -gui/data/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"], []) -AC_CHECK_LIB(rt, shm_open, [LIBS="$LIBS -lrt"], [AC_DEFINE([NO_RT_SHM], [1], [rt_shm])]) -AC_CHECK_LIB(archive, archive_read_open_filename) - -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, OpenAL or PulseAudio - -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 - PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, have_alsa=yes, have_alsa=no) -elif test "x$SOUND" = xpulseaudio; then - PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= 0.9.16, have_pulseaudio=yes) -elif test "x$SOUND" = xoss; then - AC_CHECK_HEADER(sys/soundcard.h, have_oss=yes, have_oss=no) - if test "x$have_oss" = xno; then - AC_MSG_ERROR([sys/soundcard.h not found!]) - 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 - AM_CONDITIONAL(SOUND_NULL, true) -else - AM_CONDITIONAL(SOUND_SDL, true) -fi - -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) - -AC_CHECK_HEADER(zlib.h, have_zlib=yes, have_zlib=no) -if test "x$have_zlib" = xno; then - AC_MSG_ERROR([unable to find libz headers]) -fi -AC_CHECK_HEADER(X11/extensions/Xv.h, have_xv=yes, have_xv=no) -if test "x$have_xv" = xno; then - AC_MSG_ERROR([unable to find xv headers]) -fi -AC_CHECK_HEADER(X11/extensions/XTest.h, have_xtest=yes, have_xtest=no) -if test "x$have_xtest" = xno; then - AC_MSG_ERROR([unable to find xtest headers]) -fi - -AM_CONDITIONAL(USE_LIBCDIO, false) - -AC_ARG_ENABLE(libcdio, [ --enable-libcdio use GNU libcdio for CD-ROM support (default=no)], -[ BUILD_LIBCDIO="$enableval" ],[ BUILD_LIBCDIO="no" ]) - -if test "$BUILD_LIBCDIO" = "yes"; then - PKG_CHECK_MODULES(LIBCDIO, libcdio, [], AC_MSG_ERROR([*** libcdio not found!])) - AM_CONDITIONAL(USE_LIBCDIO, true) -fi - -AC_SUBST(LIBCDIO_CFLAGS) -AC_SUBST(LIBCDIO_LIBS) - -AC_ARG_ENABLE(opengl, [ --enable-opengl build OpenGL plugin (default=no)], -[ BUILD_OPENGL="$enableval" ],[ BUILD_OPENGL="no" ]) - -PEOPSXGL="" - -if test "$BUILD_OPENGL" = "yes"; then - AC_CHECK_HEADER(GL/gl.h, have_gl=yes, have_gl=no) - if test "x$have_gl" = xno; then - AC_MSG_ERROR([unable to find OpenGL headers]) - fi - AC_CHECK_HEADER(GL/glx.h, have_glx=yes, have_glx=no) - if test "x$have_glx" = xno; then - AC_MSG_ERROR([unable to find GLX headers]) - fi - AC_CHECK_HEADER(X11/extensions/xf86vmode.h, have_vmode=yes, have_vmode=no, - [[#include <GL/gl.h> - #include <GL/glx.h> - ]]) - if test "x$have_vmode" = xno; then - AC_MSG_ERROR([unable to find xf86vmode headers]) - fi - PEOPSXGL="plugins/peopsxgl" - AC_SUBST(PEOPSXGL) -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) -fi - -#####apt-get install libavcodec-dev libavformat-dev libavutil-dev -AC_ARG_ENABLE(ccdda, [ --enable-ccdda support for compressed CDDA formats via ffmpeg (default=no)], -[ BUILD_CCDDA="$enableval" ],[ BUILD_CCDDA="no" ]) - -if test "$BUILD_CCDDA" = "yes"; then - AC_DEFINE([ENABLE_CCDDA], [1], [Defined when compressed cdda support wanted.]) - #AC_CHECK_HEADER([libavutil/mathematics.h],, AC_MSG_ERROR("No ffmpeg headers libavcodec/avcodec.h libavutil/mathematics.h")) - #AC_CHECK_HEADER([libavcodec/avcodec.h],, AC_MSG_ERROR("No ffmpeg headers libavcodec/avcodec.h libavutil/mathematics.h")) - AC_CHECK_HEADERS([libavcodec/avcodec.h libavutil/mathematics.h libavformat/avformat.h],,AC_MSG_ERROR("No ffmpeg headers libavcodec/avcodec.h libavformat/avformat.h libavutil/mathematics.h")) - #AC_CHECK_LIB([avcodec], [main], [LIBS="$LIBS -l:libavcodec.so.52 "], AC_MSG_ERROR("No avcodec library")) - #AC_CHECK_LIB(avutil, [main], [LIBS="$LIBS -l:libavutil.so.52 "], AC_MSG_ERROR("No avutil library")) - #AC_CHECK_LIB(avformat, [main], [LIBS="$LIBS -l:libavformat.so.52 "], AC_MSG_ERROR("No avformat library")) - AC_CHECK_LIB([avcodec], [main], [LIBS="$LIBS -lavcodec"], AC_MSG_ERROR("No avcodec library")) - AC_CHECK_LIB([avutil], [main], [LIBS="$LIBS -lavutil"], AC_MSG_ERROR("No avutil library")) - AC_CHECK_LIB([avformat], [main], [LIBS="$LIBS -lavformat"], AC_MSG_ERROR("No avformat library")) - AC_CHECK_LIB([swresample], [main], [LIBS="$LIBS -lswresample"], AC_MSG_ERROR("No swresample library")) - #AC_CHECK_LIB(avcodec ,[main],AC_DEFINE([HAVE_LIBAVCODEC], [1], [ ]),AC_MSG_ERROR([$errormsgl])) - #AC_CHECK_LIB(swscale ,[main],AC_DEFINE([HAVE_LIBSWSCALE], [1], [ ]),AC_MSG_ERROR([$errormsgl]), [-lavutil]) - #AC_CHECK_LIB(avdevice ,[main],AC_DEFINE([HAVE_LIBAVDEVICE], [1], [ ]),AC_MSG_ERROR([$errormsgl]), [-lavcodec -lavutil -lavformat]) -fi - -AM_CONDITIONAL(X86_NASM, false) - -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]) - AM_CONDITIONAL(X86_NASM, false) - else - AM_CONDITIONAL(X86_NASM, true) - fi - fi -fi - -AM_CONDITIONAL(ARCH_X86, false) -AM_CONDITIONAL(ARCH_X86_64, false) -AM_CONDITIONAL(ARCH_PPC, false) - -AC_ARG_ENABLE(dynarec, [ --enable-dynarec=... force selection of dynamic recompiler platform (auto/no/x86/x86_64/ppc) (default: auto)], -[ DYNAREC="$enableval" ],[ DYNAREC="auto" ]) - -if test "x$DYNAREC" = xauto; then - DYNARECSEL="auto" -elif test "x$DYNAREC" = xx86; then - DYNARECSEL="x86" -elif test "x$DYNAREC" = xx86_64; then - DYNARECSEL="x86_64" -elif test "x$DYNAREC" = xppc; then - DYNARECSEL="ppc" -elif test "x$DYNAREC" = xno; then - DYNARECSEL="no" -else - AC_MSG_WARN([Dynamic Recompiler "$DYNAREC" not found. Autodetecting...]) - DYNARECSEL="auto" -fi - -if test "x$DYNARECSEL" = xauto; then - if expr x"$build_cpu" : 'xi.86' > /dev/null; then - DYNARECSEL="x86" - elif expr x"$build_cpu" : 'xx86_64' > /dev/null; then - DYNARECSEL="x86_64" - 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.]) -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]) -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]) -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 - -AC_C_BIGENDIAN(AC_DEFINE([__BIGENDIAN__],[],[define on a big endian system])) - -AC_DEFINE([__LINUX__], [1], [Define if building on a GNU/Linux system.]) -AC_DEFINE([MAXPATHLEN], [4096], [Define to the maximum length of any path.]) - -AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 6603ffa4..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -man_MANS = pcsxr.1 -EXTRA_DIST = keys.txt tweaks.txt $(man_MANS) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 08bd4d6f..93c9c328 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -99,3 +99,4 @@ install(TARGETS pcsxr RUNTIME DESTINATION bin) install(FILES data/pcsxr.desktop DESTINATION share/applications) install(FILES data/pixmaps/pcsxr-icon.png DESTINATION share/icons/hicolor/48x48/apps) +add_subdirectory("po") diff --git a/gui/Makefile.am b/gui/Makefile.am deleted file mode 100644 index 7666dfe7..00000000 --- a/gui/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \ - -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ - -DLOCALE_DIR=\"${datadir}/locale/\" \ - $(GTK3_CFLAGS) \ - -I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \ - -DPSEMU_DATA_DIR=\"${datadir}/psemu\" \ - -DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\" - -bin_PROGRAMS = pcsxr - -pcsxr_SOURCES = \ - LnxMain.c \ - Linux.h \ - nopic.h \ - Plugin.c \ - Config.c \ - GtkGui.c \ - MemcardDlg.c \ - MemcardDlg.h \ - ConfDlg.c \ - ConfDlg.h \ - Cheat.c \ - Cheat.h \ - DebugMemory.c \ - DebugMemory.h \ - AboutDlg.c \ - AboutDlg.h \ - GtkResources.c \ - GtkResources.h - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/gui"> - <file>pcsxr.ui</file> - <file>pixmaps/pcsxr-about.png</file> - <file>pixmaps/pcsxr-cd-open.png</file> - <file>pixmaps/pcsxr-cheats-browse.png</file> - <file>pixmaps/pcsxr-cheats-search.png</file> - <file>pixmaps/pcsxr-cheats.png</file> - <file>pixmaps/pcsxr-cpu.png</file> - <file>pixmaps/pcsxr-exit.png</file> - <file>pixmaps/pcsxr-icon.png</file> - <file>pixmaps/pcsxr-iso-open.png</file> - <file>pixmaps/pcsxr-iso-reopen.png</file> - <file>pixmaps/pcsxr-load-state.png</file> - <file>pixmaps/pcsxr-memcard.png</file> - <file>pixmaps/pcsxr-memory-dump.png</file> - <file>pixmaps/pcsxr-play.png</file> - <file>pixmaps/pcsxr-plugin-cdr.png</file> - <file>pixmaps/pcsxr-plugin-gpu.png</file> - <file>pixmaps/pcsxr-plugin-netplay.png</file> - <file>pixmaps/pcsxr-plugin-pad.png</file> - <file>pixmaps/pcsxr-plugin-sio1.png</file> - <file>pixmaps/pcsxr-plugin-spu.png</file> - <file>pixmaps/pcsxr-reset.png</file> - <file>pixmaps/pcsxr-run-bios.png</file> - <file>pixmaps/pcsxr-run-exe.png</file> - <file>pixmaps/pcsxr-save-state.png</file> - <file>pixmaps/pcsxr-settings.png</file> - <file>pixmaps/pcsxr-shutdown.png</file> - <file>pixmaps/pcsxr.png</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -pcsxr.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -pcsxr_gresource: pcsxr.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/data --generate-dependencies $(srcdir)/$<) -GtkResources.c: pcsxr.gresource.xml $(pcsxr_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate-source --c-name pcsxr $< -GtkResources.h: pcsxr.gresource.xml $(pcsxr_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate-header --c-name pcsxr $< - -pcsxr_LDADD = \ - ../libpcsxcore/libpcsxcore.a \ - $(GTK3_LIBS) -lpthread -lz -lm -lXext -lXtst - -CLEANFILES = pcsxr.gresource.xml GtkResources.c GtkResources.h diff --git a/gui/data/Makefile.am b/gui/data/Makefile.am deleted file mode 100644 index 07966973..00000000 --- a/gui/data/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -#glade_DATA = pcsxr.ui -#gladedir = $(datadir)/pcsxr - -desktopdir = $(datadir)/applications -desktop_DATA = pcsxr.desktop - -EXTRA_DIST = $(glade_DATA) $(desktop_DATA) diff --git a/gui/data/pixmaps/Makefile.am b/gui/data/pixmaps/Makefile.am deleted file mode 100644 index f5be2e62..00000000 --- a/gui/data/pixmaps/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -#pixmapdir = "$(datadir)/pcsxr" -#pixmap_DATA = \ - pcsxr-cd-open.png \ - pcsxr-iso-open.png \ - pcsxr-iso-reopen.png \ - pcsxr-memcard.png \ - pcsxr-play.png \ - pcsxr-plugin-cdr.png \ - pcsxr-plugin-gpu.png \ - pcsxr-plugin-pad.png \ - pcsxr-plugin-sio1.png \ - pcsxr-plugin-spu.png \ - pcsxr.png - -icondir = "$(datadir)/pixmaps" -icon_DATA = pcsxr-icon.png - -EXTRA_DIST = $(pixmap_DATA) $(icon_DATA) diff --git a/po/CMakeLists.txt b/gui/po/CMakeLists.txt index 4695aba5..4695aba5 100644 --- a/po/CMakeLists.txt +++ b/gui/po/CMakeLists.txt diff --git a/po/ko_KR.po b/gui/po/ko_KR.po index 898bfc6b..898bfc6b 100644 --- a/po/ko_KR.po +++ b/gui/po/ko_KR.po diff --git a/po/pcsxr.pot b/gui/po/pcsxr.pot index 9c31b34b..9c31b34b 100644 --- a/po/pcsxr.pot +++ b/gui/po/pcsxr.pot diff --git a/po/pt_BR.po b/gui/po/pt_BR.po index 3748b7e9..3748b7e9 100644 --- a/po/pt_BR.po +++ b/gui/po/pt_BR.po diff --git a/po/zh_CN.po b/gui/po/zh_CN.po index c34e0e7d..c34e0e7d 100644 --- a/po/zh_CN.po +++ b/gui/po/zh_CN.po diff --git a/po/zh_TW.po b/gui/po/zh_TW.po index e5994bb1..e5994bb1 100644 --- a/po/zh_TW.po +++ b/gui/po/zh_TW.po diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am deleted file mode 100644 index ee585ab7..00000000 --- a/libpcsxcore/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -I$(top_srcdir)/include - -noinst_LIBRARIES = libpcsxcore.a - -libpcsxcore_a_SOURCES = \ - psxbios.c \ - cdrom.c \ - psxcounters.c \ - psxdma.c \ - disr3000a.c \ - gpu.c \ - gpu.h \ - spu.c \ - sio.c \ - psxhw.c \ - mdec.c \ - psxmem.c \ - misc.c \ - plugins.c \ - decode_xa.c \ - r3000a.c \ - psxinterpreter.c \ - gte.c \ - psxhle.c \ - cdrom.h \ - coff.h \ - debug.c \ - debug.h \ - decode_xa.h \ - ecm.h \ - gte.h \ - mdec.h \ - misc.h \ - plugins.h \ - psemu_plugin_defs.h \ - psxbios.h \ - psxcommon.c \ - psxcommon.h \ - psxcounters.h \ - psxdma.h \ - psxhle.h \ - psxhw.h \ - psxmem.h \ - r3000a.h \ - sio.h \ - sjisfont.h \ - spu.h \ - system.h \ - cdriso.c \ - cdriso.h \ - cheat.c \ - cheat.h \ - socket.c \ - socket.h \ - ppf.c \ - ppf.h \ - pgxp_cpu.c \ - pgxp_cpu.h \ - pgxp_debug.c \ - pgxp_debug.h \ - pgxp_gte.c \ - pgxp_gte.h \ - pgxp_mem.c \ - pgxp_mem.h \ - pgxp_value.c \ - pgxp_value.h - -if ARCH_X86_64 -libpcsxcore_a_SOURCES += \ - ix86_64/iGte.h \ - ix86_64/iR3000A-64.c \ - ix86_64/ix86-64.c \ - ix86_64/ix86-64.h \ - ix86_64/ix86_cpudetect.c \ - ix86_64/ix86_fpu.c \ - ix86_64/ix86_3dnow.c \ - ix86_64/ix86_mmx.c \ - ix86_64/ix86_sse.c \ - ix86_64/iPGXP.h -else -if ARCH_X86 -libpcsxcore_a_SOURCES += \ - ix86/iGte.h \ - ix86/iR3000A.c \ - ix86/ix86.c \ - ix86/ix86.h \ - ix86/iPGXP.h -endif -endif - -if ARCH_PPC -libpcsxcore_a_SOURCES += \ - ppc/pGte.h \ - ppc/pR3000A.c \ - ppc/ppc.c \ - ppc/ppc.h \ - ppc/ppc_mnemonics.h \ - ppc/reguse.c \ - ppc/reguse.h -libpcsxcore_a_CCASFLAGS = -x assembler-with-cpp -mregnames -D__POWERPC__ -endif diff --git a/m4/ax_append_link_flags.m4 b/m4/ax_append_link_flags.m4 deleted file mode 100644 index 6f7f1745..00000000 --- a/m4/ax_append_link_flags.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# For every FLAG1, FLAG2 it is checked whether the linker works with the -# flag. If it does, the flag is added FLAGS-VARIABLE -# -# If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is -# used. During the check the flag is always added to the linker's flags. -# -# If EXTRA-FLAGS is defined, it is added to the linker's default flags -# when the check is done. The check is thus made with the flags: "LDFLAGS -# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -# issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG. -# Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS. -# -# LICENSE -# -# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.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 3 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 <https://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 6 - -AC_DEFUN([AX_APPEND_LINK_FLAGS], -[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) -for flag in $1; do - AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4]) -done -])dnl AX_APPEND_LINK_FLAGS diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 deleted file mode 100644 index 17c3eab7..00000000 --- a/m4/ax_require_defined.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_REQUIRE_DEFINED(MACRO) -# -# DESCRIPTION -# -# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have -# been defined and thus are available for use. This avoids random issues -# where a macro isn't expanded. Instead the configure script emits a -# non-fatal: -# -# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found -# -# It's like AC_REQUIRE except it doesn't expand the required macro. -# -# Here's an example: -# -# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -# -# LICENSE -# -# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org> -# -# 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 any -# warranty. - -#serial 2 - -AC_DEFUN([AX_REQUIRE_DEFINED], [dnl - m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) -])dnl AX_REQUIRE_DEFINED diff --git a/pcsxr.anjuta b/pcsxr.anjuta deleted file mode 100644 index 2389e4c1..00000000 --- a/pcsxr.anjuta +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<anjuta> - <plugin name="GBF Project Manager" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaProjectManager"/> - <require group="Project" - attribute="Supported-Project-Types" - value="automake"/> - </plugin> - <plugin name="Symbol Browser" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaSymbolManager"/> - </plugin> - <plugin name="Make Build System" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaBuildable"/> - <require group="Build" - attribute="Supported-Build-Types" - value="make"/> - </plugin> - <plugin name="Task Manager" - url="http://anjuta.org/plugins/" - mandatory="no"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaTodo"/> - </plugin> - <plugin name="Debug Manager" - url="http://anjuta.org/plugins/" - mandatory="no"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaDebugManager"/> - </plugin> -</anjuta> diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am deleted file mode 100644 index 0576714f..00000000 --- a/plugins/bladesio1/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libBladeSio1.la - -libBladeSio1_la_SOURCES = cfg.c sio1.c sio1.h fifo.c fifo.h connection.c connection.h typedefs.h -libBladeSio1_la_LDFLAGS = -module -avoid-version - -AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK3_CFLAGS) \ - -I$(top_srcdir)/libpcsxcore -I../../include - -bin_PROGRAMS = cfgBladeSio1 -cfgBladeSio1_SOURCES = gui.c sio1.h GtkResources.c GtkResources.h -cfgBladeSio1_LDADD = $(GTK3_LIBS) - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/bladesio1"> - <file>sio1.ui</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -bladesio1.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -bladesio1_gresource: bladesio1.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<) -GtkResources.c: bladesio1.gresource.xml $(bladesio1_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name bladesio1 $< -GtkResources.h: bladesio1.gresource.xml $(bladesio1_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name bladesio1 $< - - -#glade_DATA = sio1.ui -#gladedir = $(datadir)/psemu/ -EXTRA_DIST = $(glade_DATA) - -CLEANFILES = bladesio1.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am deleted file mode 100644 index 112d7512..00000000 --- a/plugins/dfcdrom/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -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 = -libDFCdrom_la_LDFLAGS = -module -avoid-version -libDFCdrom_la_LIBADD = -lpthread - -if USE_LIBCDIO -libDFCdrom_la_CFLAGS += -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS) -libDFCdrom_la_LIBADD += $(LIBCDIO_LIBS) -endif - -AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK3_CFLAGS) \ - -I$(top_srcdir)/libpcsxcore -I../../include - -bin_PROGRAMS = cfgDFCdrom -cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c GtkResources.c GtkResources.h -cfgDFCdrom_LDADD = $(GTK3_LIBS) - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/dfcdrom"> - <file>dfcdrom.ui</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -dfcdrom.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -dfcdrom_gresource: dfcdrom.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-dependencies $(srcdir)/$<) -GtkResources.c: dfcdrom.gresource.xml $(dfcdrom_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-source --c-name dfcdrom $< -GtkResources.h: dfcdrom.gresource.xml $(dfcdrom_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-header --c-name dfcdrom $< - - -#glade_DATA = cdrcfg-0.1df/dfcdrom.ui -#gladedir = $(datadir)/psemu/ -EXTRA_DIST = $(glade_DATA) - -CLEANFILES = dfcdrom.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am deleted file mode 100644 index 60a57488..00000000 --- a/plugins/dfinput/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libDFInput.la - -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 $(SDL2_LIBS) $(SDL_LIBS) - -AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK3_CFLAGS) \ - -I../../include -I$(top_srcdir)/libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS) - -bin_PROGRAMS = cfgDFInput -cfgDFInput_SOURCES = cfg-gtk.c pad.h GtkResources.c GtkResources.h -cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL2_LIBS) $(SDL_LIBS) -lX11 - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/dfinput"> - <file>dfinput.ui</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -dfinput.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -dfinput_gresource: dfinput.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<) -GtkResources.c: dfinput.gresource.xml $(dfinput_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name dfinput $< -GtkResources.h: dfinput.gresource.xml $(dfinput_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name dfinput $< - - -#glade_DATA = dfinput.ui -#gladedir = $(datadir)/psemu/ -EXTRA_DIST = $(glade_DATA) - -CLEANFILES = dfinput.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am deleted file mode 100755 index d23d9d08..00000000 --- a/plugins/dfnet/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libDFNet.la - -libDFNet_la_SOURCES = dfnet.c dfnet.h unix.c cfg.c -libDFNet_la_LDFLAGS = -module -avoid-version - -AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK3_CFLAGS) \ - -I$(top_srcdir)/libpcsxcore -I../../include - -bin_PROGRAMS = cfgDFNet -cfgDFNet_SOURCES = gui.c GtkResources.c GtkResources.h -cfgDFNet_LDADD = $(GTK3_LIBS) - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/dfnet"> - <file>dfnet.ui</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -dfnet.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -dfnet_gresource: dfnet.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<) -GtkResources.c: dfnet.gresource.xml $(dfnet_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name dfnet $< -GtkResources.h: dfnet.gresource.xml $(dfnet_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name dfnet $< - - -#glade_DATA = dfnet.ui -#gladedir = $(datadir)/psemu/ -EXTRA_DIST = $(glade_DATA) - -CLEANFILES = dfnet.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am deleted file mode 100755 index 16c0129d..00000000 --- a/plugins/dfsound/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -AM_CPPFLAGS = -I../../include - -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libDFSound.la - -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_CPPFLAGS = $(AM_CPPFLAGS) -libDFSound_la_LDFLAGS = -module -avoid-version -libDFSound_la_LIBADD = -lpthread -lm - -if SOUND_ALSA -libDFSound_la_SOURCES += alsa.c -libDFSound_la_CPPFLAGS += -DUSEALSA=1 -libDFSound_la_LIBADD += $(ALSA_LIBS) -endif - -if SOUND_OSS -libDFSound_la_SOURCES += oss.c -libDFSound_la_CPPFLAGS += -DUSEOSS=1 -endif - -if SOUND_PULSEAUDIO -libDFSound_la_SOURCES += pulseaudio.c -libDFSound_la_CPPFLAGS += -DUSEPULSEAUDIO=1 $(PULSEAUDIO_CFLAGS) -libDFSound_la_LIBADD += $(PULSEAUDIO_LIBS) -endif - -if SOUND_SDL -libDFSound_la_SOURCES += sdl.c -libDFSound_la_CPPFLAGS += -DUSESDL=1 $(SDL2_CFLAGS) $(SDL_CFLAGS) -libDFSound_la_LIBADD += $(SDL2_LIBS) $(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_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 GtkResources.c GtkResources.h -cfgDFSound_LDADD = $(GTK3_LIBS) - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/dfsound"> - <file>dfsound.ui</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -dfsound.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -dfsound_gresource: dfsound.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/spucfg-0.1df --generate-dependencies $(srcdir)/$<) -GtkResources.c: dfsound.gresource.xml $(dfsound_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-source --c-name dfsound $< -GtkResources.h: dfsound.gresource.xml $(dfsound_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-header --c-name dfsound $< - -#glade_DATA = spucfg-0.1df/dfsound.ui -#gladedir = $(datadir)/psemu/ -EXTRA_DIST = $(glade_DATA) - -CLEANFILES = dfsound.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am deleted file mode 100755 index 15b44b59..00000000 --- a/plugins/dfxvideo/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh - -SUFFIXES = .asm - -.asm.lo: - $(LIBTOOL) --tag=CC --mode=compile \ - $(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $< - -AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK3_CFLAGS)\ - -I$(top_srcdir)/libpcsxcore \ - -I../../include - -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libDFXVideo.la - -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 macros.inc -AM_CPPFLAGS += -DUSE_NASM=1 -endif -libDFXVideo_la_LDFLAGS = -module -avoid-version -libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm - -bin_PROGRAMS = cfgDFXVideo -cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c GtkResources.c GtkResources.h -cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/dfxvideo"> - <file>dfxvideo.ui</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -dfxvideo.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -dfxvideo_gresource: dfxvideo.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg-0.1df --generate-dependencies $(srcdir)/$<) -GtkResources.c: dfxvideo.gresource.xml $(dfxvideo_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg-0.1df --generate-source --c-name dfxvideo $< -GtkResources.h: dfxvideo.gresource.xml $(dfxvideo_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg-0.1df --generate-header --c-name dfxvideo $< - - -#glade_DATA = gpucfg-0.1df/dfxvideo.ui -#gladedir = $(datadir)/psemu/ -EXTRA_DIST = $(glade_DATA) - -CLEANFILES = dfxvideo.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/nullsio1/Makefile.am b/plugins/nullsio1/Makefile.am deleted file mode 100644 index 9d78b632..00000000 --- a/plugins/nullsio1/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libNullSio1.la - -libNullSio1_la_SOURCES = sio1.c typedefs.h -libNullSio1_la_LDFLAGS = -module -avoid-version - -AM_CPPFLAGS = -DDATADIR=\"${datadir}/psemu/\" \ - -I$(top_srcdir)/libpcsxcore -I../../include diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am deleted file mode 100755 index e72e8dd5..00000000 --- a/plugins/peopsxgl/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ - -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK3_CFLAGS) \ - -I$(top_srcdir)/libpcsxcore -I../../include - -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libpeopsxgl.la - -libpeopsxgl_la_SOURCES = \ - cfg.c cfg.h \ - draw.c draw.h \ - fps.c fps.h \ - gl_ext.h \ - gpu.c gpu.h \ - key.c key.h \ - menu.c menu.h \ - prim.c prim.h \ - soft.c soft.h \ - texture.c texture.h \ - gte_accuracy.c gte_accuracy.h \ - pgxp_gpu.c pgxp_gpu.h -libpeopsxgl_la_LDFLAGS = -module -avoid-version -libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm - -bin_PROGRAMS = cfgpeopsxgl -cfgpeopsxgl_SOURCES = gpucfg/main.c GtkResources.c GtkResources.h -cfgpeopsxgl_LDADD = $(GTK3_LIBS) - -# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. -#define gresource_xml = -define gresource_xml -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/pcsxr/peopsxgl"> - <file>peopsxgl.ui</file> - </gresource> -</gresources> -endef -# FIXME -export gresource_xml - -peopsxgl.gresource.xml: -# $(file >$@,$(gresource_xml)) - @echo "$$gresource_xml" >$@ -peopsxgl_gresource: peopsxgl.gresource.xml - $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg --generate-dependencies $(srcdir)/$<) -GtkResources.c: peopsxgl.gresource.xml $(peopsxgl_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-source --c-name peopsxgl $< -GtkResources.h: peopsxgl.gresource.xml $(peopsxgl_gresource) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-header --c-name peopsxgl $< - - -#glade_DATA = gpucfg/peopsxgl.ui -#gladedir = $(datadir)/psemu/ -EXTRA_DIST = $(glade_DATA) - -CLEANFILES = peopsxgl.gresource.xml GtkResources.c GtkResources.h diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 0f5e43ec..00000000 --- a/po/LINGUAS +++ /dev/null @@ -1,9 +0,0 @@ -zh_CN -zh_TW -pt_BR -ru -it -fr -hu -ko_KR -es diff --git a/po/Makefile.in.in b/po/Makefile.in.in deleted file mode 100644 index 3d02752c..00000000 --- a/po/Makefile.in.in +++ /dev/null @@ -1,214 +0,0 @@ -# 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 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. -# -# - 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 = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -datarootdir = @datarootdir@ -libdir = @libdir@ -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@ - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -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@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) - -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) - -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) - -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=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -.SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-data -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - 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)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - 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)/$$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 - -# Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: - -uninstall: - 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 - -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 *.pox *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo - -maintainer-clean: distclean - -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 \ - 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`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - 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 \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -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. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/po/Makevars b/po/Makevars deleted file mode 100644 index 7d3f81b4..00000000 --- a/po/Makevars +++ /dev/null @@ -1,41 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = PCSX-Reloaded - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = whistler_wmz@users.sf.net - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = diff --git a/po/POTFILES.in b/po/POTFILES.in deleted file mode 100644 index 953ed3b5..00000000 --- a/po/POTFILES.in +++ /dev/null @@ -1,103 +0,0 @@ -[type: gettext/glade]data/pcsxr.ui -gui/AboutDlg.c -gui/AboutDlg.h -gui/Cheat.c -gui/Cheat.h -gui/ConfDlg.c -gui/ConfDlg.h -gui/Config.c -gui/DebugMemory.c -gui/DebugMemory.h -gui/GtkGui.c -gui/Linux.h -gui/LnxMain.c -gui/MemcardDlg.c -gui/MemcardDlg.h -gui/nopic.h -gui/Plugin.c -libpcsxcore/cdriso.c -libpcsxcore/cdrom.c -libpcsxcore/cheat.c -libpcsxcore/debug.c -libpcsxcore/decode_xa.c -libpcsxcore/disr3000a.c -libpcsxcore/gte.c -libpcsxcore/mdec.c -libpcsxcore/misc.c -libpcsxcore/plugins.c -libpcsxcore/ppf.c -libpcsxcore/psxbios.c -libpcsxcore/psxcommon.c -libpcsxcore/psxcounters.c -libpcsxcore/psxdma.c -libpcsxcore/psxhle.c -libpcsxcore/psxhw.c -libpcsxcore/psxinterpreter.c -libpcsxcore/psxmem.c -libpcsxcore/r3000a.c -libpcsxcore/sio.c -libpcsxcore/socket.c -libpcsxcore/spu.c -plugins/dfcdrom/cdr.c -[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-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 -[type: gettext/glade]plugins/dfnet/dfnet.ui -plugins/dfnet/dfnet.h -plugins/dfnet/gui.c -plugins/dfnet/unix.c -plugins/dfsound/adsr.c -plugins/dfsound/alsa.c -plugins/dfsound/cfg.c -plugins/dfsound/dma.c -plugins/dfsound/freeze.c -plugins/dfsound/nullsnd.c -plugins/dfsound/oss.c -plugins/dfsound/pulseaudio.c -plugins/dfsound/registers.c -plugins/dfsound/reverb.c -plugins/dfsound/spu.c -[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 -[type: gettext/glade]plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui -plugins/dfxvideo/key.c -plugins/dfxvideo/menu.c -plugins/dfxvideo/prim.c -plugins/dfxvideo/soft.c -plugins/dfxvideo/zn.c -plugins/peopsxgl/cfg.c -plugins/peopsxgl/draw.c -plugins/peopsxgl/fps.c -plugins/peopsxgl/gpu.c -plugins/peopsxgl/gpucfg/main.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/cfg.c -plugins/bladesio1/sio1.c -[type: gettext/glade]plugins/bladesio1/sio1.ui -plugins/bladesio1/sio1.h -win32/gui/AboutDlg.c -win32/gui/CheatDlg.c -win32/gui/ConfigurePlugins.c -win32/gui/plugin.c -win32/gui/WndMain.c diff --git a/strip_fPIC.sh b/strip_fPIC.sh deleted file mode 100755 index 6edacd2d..00000000 --- a/strip_fPIC.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# libtool assumes that the compiler can handle the -fPIC flag -# This isn't always true (for example, nasm can't handle it) -command="" -while [ $1 ]; do - if [ "$1" != "-fPIC" ]; then - if [ "$1" != "-DPIC" ]; then - command="$command $1" - fi - fi - shift -done -echo $command -exec $command diff --git a/win32/gui/pcsxr.bmp b/win32/gui/pcsxr.bmp Binary files differindex 77f2e9f2..48004c2d 100755..100644 --- a/win32/gui/pcsxr.bmp +++ b/win32/gui/pcsxr.bmp |
