Commit graph

118 commits

Author SHA1 Message Date
Richard Goedeken
1659e0067d
Merge pull request #16 from bsmiles32/bugfix/glew_fix
Don't include gl headers at all. GLEW already takes care of that.
2018-08-26 22:24:53 -07:00
Bobby Smiles
8388c19cca Don't include gl headers at all. GLEW already takes care of that.
See https://www.khronos.org/opengl/wiki/OpenGL_Loading_Library#GLEW_.28OpenGL_Extension_Wrangler.29
2018-08-15 18:53:25 +02:00
Richard Goedeken
f3ee41b133
Merge pull request #14 from bsmiles32/fix_warnings
Fix ambiguous indenting warning emitted by gcc.
2018-05-29 16:03:53 -07:00
Bobby Smiles
d14582ada2 Fix ambiguous indenting warning emitted by gcc. 2018-05-29 22:46:10 +02:00
bsmiles32
5dc8f752b2
Merge pull request #13 from bentley/master
Update homepage links
2018-01-01 17:45:47 +01:00
Anthony J. Bentley
16a716a6a7 Update homepage. 2017-12-28 16:30:44 -07:00
Anthony J. Bentley
2be1ad0063 Update link to bug tracker. 2017-12-28 16:21:50 -07:00
Richard Goedeken
1fd9fd4991
Merge pull request #12 from charlemagnelasse/travis-mxe
Build MXE targets as additional tests in travis build matrix
2017-11-08 20:06:56 -08:00
Charlemagne Lasse
32fcfd220b Build MXE targets as additional tests in travis build matrix 2017-11-05 15:36:31 +01:00
Dorian Fevrier
a91e36d283 Merge pull request #11 from charlemagnelasse/travis-container
Use faster container based Travis CI
2017-09-13 12:17:24 +02:00
Charlemagne Lasse
52df30a7b4 Use faster container based Travis CI 2017-09-01 09:57:14 +02:00
Charlemagne Lasse
284bd4792f Let travis handle the package installation directly
The before_install  currently fails on Travis CI with:

    The following packages have unmet dependencies:
     libsdl2-dev : Depends: libegl1-mesa-dev
                   Depends: libgles2-mesa-dev
    E: Unable to correct problems, you have held broken packages.

This can currently only be solved by using the apt addon to install
packages.
2017-09-01 09:56:26 +02:00
Richard Goedeken
b244f4fc83 Merge pull request #10 from charlemagnelasse/master
Use Ubuntu Trusty as base system for Travis CI
2016-09-01 18:04:23 -07:00
Charlemagne Lasse
214e23a55d Remove unused Travis CI define __extern_always_inline 2016-09-01 20:37:12 +02:00
Charlemagne Lasse
680acb9cb9 Use Ubuntu Trusty as base system for Travis CI 2016-09-01 20:23:59 +02:00
Richard Goedeken
0bf1bcf3b3 Merge pull request #9 from gizmo98/master
Fix glew.h path
2016-08-15 18:20:09 -07:00
gizmo98
939a84060d Fix glew.h path 2016-08-14 14:07:34 +02:00
Richard Goedeken
76c2a68b9d Merge pull request #8 from greisch/guille
fix missing SDL2 test
2015-08-13 22:15:31 -07:00
Guillermo Reisch
44cb86856a fix missing SDL2 test 2015-08-12 19:21:52 -03:00
Richard Goedeken
ea53a588b8 Merge pull request #7 from bentley/openbsd
Remove unnecessary OpenBSD warning.
2015-06-08 06:38:18 -07:00
Anthony J. Bentley
29fe93c391 Remove unnecessary OpenBSD warning. 2015-06-08 01:57:47 -06:00
Richard Goedeken
2a47c861eb Merge pull request #6 from bentley/newglew
Correct the path to the GLEW header.
2015-06-07 07:14:23 -07:00
Anthony J. Bentley
21507b3600 Correct the path to the GLEW header. 2015-06-07 02:41:28 -06:00
Richard Goedeken
72af4f0f9c Merge pull request #5 from conchurnavid/includes
Cleanup includes order and add missing includes
2015-03-21 21:36:05 -07:00
Conchúr Navid
ed6e37f8f2 Add missing includes and forward declarations 2015-03-21 13:47:41 +01:00
Conchúr Navid
a8a170a0b5 Sort the includes based on type and names 2015-03-21 10:58:41 +01:00
Conchúr Navid
86b7637129 Fix executable bits of files 2015-03-21 10:53:38 +01:00
Richard Goedeken
b0a0b5f999 Merge pull request #4 from fayvel/travisci
Add Travis CI configuration file for automatic build tests
2014-07-07 22:05:32 -07:00
Fayvel Victor
c1a8657ba9 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:32:12 +02:00
Sven Eckelmann
a958eddbe1 Merge branches 'makefile' and 'github' 2013-12-19 15:19:49 +01:00
Sven Eckelmann
1b0f7e9e19 Replace references to bitbucket with github 2013-12-19 13:27:14 +01:00
Sven Eckelmann
e671b567ec 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 13:15:44 +01:00
Sven Eckelmann
c412ed2de7 Convert .hgignore to .gitignore 2013-12-19 13:09:20 +01:00
Sven Eckelmann
3afda34f49 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-12-19 12:07:07 +01:00
Sven Eckelmann
096b387f5b Fix error message for missing glew library 2013-12-19 12:06:56 +01:00
wahrhaft
25d5fd4ea6 Added tag 2.0.0 for changeset 1393910be940 2013-07-04 22:23:14 -04:00
wahrhaft
066cfd90c2 Bump version to 2.0.0 2013-07-04 21:56:54 -04:00
Sven Eckelmann
f28bb2c249 Add missing name when creating thread with SDL2 2013-06-11 00:24:15 +02:00
Sven Eckelmann
d189392448 Update video extension API version to 3.0.0 and video plugin API version to 2.2.0 2013-05-28 21:18:25 +02:00
Sven Eckelmann
07f54417cf 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 15:00:12 +02:00
Sven Eckelmann
f709d91d80 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:26:31 +02:00
Sven Eckelmann
f6c440d524 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-09 22:50:11 +02:00
Sven Eckelmann
c085e80daf Add CXXFLAGS 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
CXXFLAGS and added to LINK.o to fix the behavior.

Option which need this are for example -fPIC/-fPIE or -flto.
2013-05-09 22:23:00 +02:00
Sven Eckelmann
9e9d1282dd Revert "Enable link time garbage collection when link time optimization is enabled"
Some linker on different platforms don't handle the garbage collection
correctly and create extreme bloated binaries. Therefore, leave it to the user
to enable this feature or not.
2013-03-14 08:09:02 +01:00
Sven Eckelmann
53d9d4ca5d Enable link time garbage collection when link time optimization is enabled 2013-02-01 10:01:54 +01:00
Sven Eckelmann
f840816788 Introduce WARNFLAGS for default (removable) compiler warning flags 2013-01-02 16:13:46 +01:00
Sven Eckelmann
205aec6822 Don't include non-existing GL/glext.h on Windows 2013-01-01 00:50:11 +01:00
Sven Eckelmann
c9b08f12a7 Disable PIC on MinGW to reduce warnings 2013-01-01 00:30:34 +01:00
n pepinpe
6b1c7fd746 Correct OpenGL includes on OSX 2012-12-31 11:15:59 +01:00
n pepinpe
f16ec87121 Include SDL header without SDL/ directory 2012-12-31 10:52:25 +01:00