Commit graph

231 commits

Author SHA1 Message Date
littleguy77
2cb09e9354 Merge remote-tracking branch 'upstream/master' 2014-12-18 22:07:18 -05:00
Richard Goedeken
8cf8f17e0e Merge pull request #5 from krnlyng/nemo_audioresource
implement audioresource support. required on nemo to enable audio output
2014-12-07 19:56:34 -08:00
Frajo Haider
126b8b3249 implement audioresource support. required on nemo to enable audio output 2014-12-04 08:18:08 +01:00
Paul Lamb
1fdacac18e Merge from upstream 2014-12-02 19:03:43 -06:00
Richard Goedeken
923b4c8d7d Merge pull request #3 from bentley/openbsd-no-oss
Disable OSS by default on OpenBSD.
2014-11-09 16:24:19 -08:00
Anthony J. Bentley
5ff4cb2f72 Disable OSS by default on OpenBSD.
OpenBSD never used OSS by default and is likely to remove libossaudio.
2014-11-08 19:44:33 -07:00
Paul Lamb
7ba6b8d885 Merge from upstream 2014-11-08 11:21:57 -06:00
Richard Goedeken
0bc2238682 Merge pull request #2 from fayvel/travisci
Add Travis CI configuration file for automatic build tests
2014-07-07 22:09:06 -07:00
Fayvel Victor
6a28354dc4 Add Travis CI configuration file for automatic build tests
Github provides a Travis CI integration which makes it easy to have a quick
check of a patch before a pull request is accepted. It is not enough to prove
the correctness of a contribution but at least helps to avoid some of the worst
build problems.

This feature *must* be enabled by the mupen64plus administrator *before this
commit is merged*:

- https://travis-ci.org/profile/mupen64plus
- Login via your Github account
- Make sure you are on "https://travis-ci.org/profile/mupen64plus"
- Switch repository to "On"
2014-07-06 12:31:41 +02:00
Richard Goedeken
5f69fc2f06 SDL 1.2 is not deprecated for us, and we shouldnt frighten the user with 6 lines of exclamation points 2014-05-04 11:27:02 -07:00
Ursula Abendroth
65f9525c19 Switch by default to SDL2 for Mupen64Plus 2.1
The current version of SDL is 2.0.3. All new releases of distributions contain
this library already. Current Linux distributions and OpenBSD even backporting
patches from Mupen64Plus 2.1 repo to use SDL 2. Android and other mobile
platform don't have support for legacy SDL 1.2.

People like Anthony J. Bentley and Riley Labrecque already requested
a new release of Mupen64Plus 2.1 with SDL2
2014-04-23 19:31:54 +02:00
littleguy77
21e7339243 android: Add android edition customizations. 2014-01-28 17:33:29 -05:00
littleguy77
1996f0b82d build: Add android makefile. 2014-01-28 17:33:18 -05:00
Sven Eckelmann
1837f96173 Force line ending type for specific files
Different operation systems (Unix vs. Windows) use different line ending types.
It can easily happen that users from different systems edit files and replace
all line endings of a file with the system specific version. This screws up
diffs and makes merges harder.

Git can normalize line endings for specific files and avoid this problem.
Binary files should be marked to avoid accidentally normalization.
2013-12-19 14:19:05 +01:00
Sven Eckelmann
4a19480020 Convert .hgignore to .gitignore 2013-12-19 14:13:38 +01:00
Sven Eckelmann
1346c0f7e0 Don't fail rebuild when header is removed
The *.d depends files for make just list the files used when building an
object file. Removing a file listed in such a dependency file causes make to
search for a way to recreate it. This usually cannot work because these files
aren't autogenerated.

The gcc option -MP can be used to generate empty rule for these files. Removing
a file in a dependency list will then execute this empty rule and continue with
the execution of the creation of the object file. This compilation process will
then automatically correct the dependency file.
2013-09-20 10:31:36 +02:00
richard42
ac039bb391 simplify OSX platform detection in makefile using xcode-select. based on patch from John Pender 2013-07-08 07:29:17 -07:00
Richard Goedeken
bce709a357 Added tag 2.0 for changeset eb2fad4ab7cc 2013-07-04 15:46:13 -07:00
Richard Goedeken
5ecbef80a2 update version number to 2.0 2013-07-03 07:05:34 -07:00
Richard Goedeken
d6b9b90507 update text files for upcoming 2.0 release 2013-06-24 22:44:01 -07:00
Sven Eckelmann
cc74b18d91 Initialize audiobuffer before mixing it against our data
SDL doesn't guarantee that the target audio buffer passed in its callback is
initialized to zero (silence). SDL_MixAudio may now try to mix the random data
from the dst buffer and the new data from the src buffer together and creating
distorted sound in this process.

Initializing the destination buffer to zero avoids this problem.
2013-06-11 10:55:08 +02:00
Richard Goedeken
3b07af44a9 tagged v2.0-rc2 2013-06-01 18:00:33 -07:00
richard42
63b56a0d17 Update msvc11 project file to visual studio 2012 (msvc11) 2013-06-01 07:53:09 -07:00
Sven Eckelmann
5ad950ffae Allow to statically set *_(CFLAGS|LIBS) without pkg-config
n.pepinpe requested in #540 to allow overwriting the automatically searched
CFLAGS and LIBS for used libraries. This should allow distributors to set the
build configuration without patching the makefile. This is important for
systems were pkg-config or sdl-config aren't normally used.
2013-05-11 14:59:48 +02:00
Sven Eckelmann
c45e2dcd2f Allow to statically set SDL_(CFLAGS|LIBS) without sdl-config
n.pepinpe requested in #540 to allow overwriting the automatically searched
CFLAGS and LIBS for used libraries. This should allow distributors to set the
build configuration without patching the makefile. This is important for
systems were pkg-config or sdl-config aren't normally used.
2013-05-11 12:25:52 +02:00
Sven Eckelmann
3a8bb412ce Enable Link-time optimization by default
The GCC introduced Link-time optimization in GCC 4.5 (2010-04-14). This should
be long enough available that interested users have upgraded to a compiler
supporting it.

The MSVC project already enabled WholeProgramOptimization since a long time.
Enabling it by default in GCC seems to be equally valid.
2013-05-11 11:25:44 +02:00
Sven Eckelmann
4267ac323b Add CFLAGS to the linker step
The GCC manual states for different parameters that the options for compilation
must also be used when linking. The options for compilation are stored in
CFLAGS and added to LINK.o to fix the behavior.

Option which need this are for example -fPIC/-fPIE or -flto.
2013-05-11 11:04:30 +02:00
Richard Goedeken
03645fba0d add msvc11 project file from mudlord 2013-03-20 22:24:30 -07:00
Sven Eckelmann
750de7c794 Fix typo in Hacktarux's nick 2013-03-14 08:29:02 +01:00
richard42
33235df9d6 merged heads 2013-02-02 22:19:06 -08:00
richard42
5dfde8da4c OSX build fix 2013-02-02 22:18:12 -08:00
Sven Eckelmann
b9dc2d58b4 Introduce WARNFLAGS for default (removable) compiler warning flags 2013-01-02 16:13:44 +01:00
Sven Eckelmann
19e8c67200 Disable OSS under MinGW to prevent build failures during cross compiles 2013-01-01 00:41:38 +01:00
Sven Eckelmann
0f854cd343 Disable PIC on MinGW to reduce warnings 2013-01-01 00:30:33 +01:00
n pepinpe
f336649a26 Fix path to OSX SDK with XCode >=4.3 2012-12-31 10:43:00 +01:00
Richard Goedeken
5796a6ca65 merge heads 2012-12-30 18:47:06 -08:00
Sven Eckelmann
522e27f10c Disabled Audio Mixing with SDL >= 1.3 to avoid distorted audio
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 src/main.c |    5 +++++
 1 file changed, 5 insertions(+)
2012-12-20 16:10:32 +01:00
Sven Eckelmann
4066559a70 Use $(OBJDIR) in clean target instead of hardcoded path 2012-12-13 14:53:04 +01:00
Sven Eckelmann
80c094b421 Allow to add a postfix for each build
The POSTFIX make option is useful for distributions to compile different
versions of the plugin in parallel. The object files will be stored in a
directory with the postfix appended and the linker result will also have this
postfix appended.
2012-12-13 14:47:15 +01:00
Sven Eckelmann
3050189433 Fix order of Makefile targets to print help by default 2012-12-13 14:07:56 +01:00
Sven Eckelmann
be8738e197 Add CROSS_COMPILE make option
The CROSS_COMPILE make option can be used to automatically prepend the prefix
to all build relevant tools to seamlessly allow cross compilation without
setting each tool name separately.

Cross compiling for MinGW32 would can be done using
$ make -C projects/unix/ CROSS_COMPILE=i686-pc-mingw32- HOST_CPU=i686 UNAME=MINGW
2012-12-13 12:25:23 +01:00
Sven Eckelmann
95db8eec0e Allow to change names of *-config tools for cross compiles 2012-12-13 11:33:49 +01:00
Sven Eckelmann
af8974e1ee Synchronize usage of environmental variables for UNAME with HOST_CPU 2012-12-13 10:52:49 +01:00
Sven Eckelmann
79e1e8e7ab Remove duplicated definition of MKDIR and CC for MinGW 2012-12-13 10:45:53 +01:00
veganaize
2c44ba6612 Add support for MingW32 2012-12-04 21:17:52 +01:00
Anthony J. Bentley
f9ad621686 Allow manually disabling OSS.
The previous check is inadequate, because OpenBSD has /dev/mixer but does
not use OSS.
2012-11-14 21:42:12 -07:00
Anthony J. Bentley
d6c1dafc14 Detect OpenBSD PowerPC platforms macppc and socppc. 2012-11-12 18:01:33 -07:00
Sven Eckelmann
7126a3ecf4 Add configuration for semi-supported architecture armel 2012-11-04 01:25:07 +01:00
Sven Eckelmann
9b27463cfa Add support for speexdsp resampler 2012-10-10 07:59:24 +02:00
Sven Eckelmann
95b879dba1 Rename NO_RESAMP compile option to NO_SRC 2012-10-10 07:59:24 +02:00