1
0
Fork 0
Commit Graph

27 Commits

Author SHA1 Message Date
James Rowe 20b622ec89 Remove cmake from the install list. Its now up to date on the new travis mac image 2016-11-11 14:45:52 -07:00
Yuri Kunde Schlesner fcec20c9ff Travis: Fix OS X build
Probably due to additional Travis caching, cmake is now already
installed when the script runs. This causes the unlink to remove the
symlink to the executable, which is then not re-added by the install
(since it's already installed).
2016-09-20 21:25:15 -07:00
Lectem 722af0703e travis cache for cmake and sdl2 (#2060) 2016-09-08 03:31:57 +01:00
MerryMage d93cfb32fe travis: Update to XCode 7.3.1 2016-09-02 16:19:09 +01:00
James Rowe a976c2e3ba CMake: Fix for QT 5.7 overwriting -std=c++1y flag
In QT 5.7 they added a new check for CXX features which appends a minimum
required standard to the CXX_FLAGS. Because we were writing the flag
directly previously, cmake assumed it needed to add a c++11 flag to the
build. This tells cmake to use c++14 on every build.
2016-08-04 17:16:16 -06:00
Lioncash a81b9ca689 travis: Use GCC 6 on Ubuntu CI builds 2016-06-17 10:48:40 -04:00
Sam Spilsbury 599dc2bbb5 travis: Install cmake 3.1 2016-04-25 10:18:40 +08:00
Lioncash 5181b4a0df travis: Update dependencies 2016-04-03 15:45:48 -04:00
MerryMage 373a790d76 OS X: Use dylibbundler to include dylibs required by citra in nightly archive 2016-03-15 00:42:37 +00:00
MerryMage ba2a54a9dd Dependencies: Remove GLFW, Add SDL2
citra: Remove GLFW, Add SDL2

FindSDL2: Do not CACHE SDL2_* variables if library is not found

EmuWindow_SDL2: Set minimal client area at initialisation time

EmuWindow_SDL2: Corrections

EmuWindow_SDL2: Fix no decorations on startup on OS X

cmake: windows_copy_files
2016-03-02 14:09:02 +00:00
archshift 808053cbcf .travis-deps.sh: don't install pkgbuild on OS X
pkgbuild is now provided by Travis itself, so homebrew throws
an error upon trying to install it.
2015-11-03 17:40:10 -08:00
archshift 2fd4f6f154 .travis-deps.sh: update curl invocation to follow 302 redirects
CMake recently 302'd the download URL we're using.
To prevent any issues, just follow the redirect with cURL.
2015-11-03 17:28:24 -08:00
archshift dfea8e9109 Update homebrew before building, which no longer uses SourceForge 2015-07-16 20:31:04 -07:00
Yuri Kunde Schlesner a60f2a93d2 Travis: Update GLFW on Linux to 3.1.1 2015-07-10 20:11:09 -03:00
Yuri Kunde Schlesner 73b6a715ee Travis: Remove use of sudo to enable use container-based builds 2015-07-10 20:00:59 -03:00
chinhodado c2046a109a Use xcpretty for xcodebuild on Travis 2015-06-01 22:20:51 -04:00
archshift 6cc1a07235 CI: upload builds to builds.citra-emu.org instead of MEGA 2015-03-16 18:09:20 -07:00
chinhodado b8801a8e4e Revert "Travis: Enable caching of dependencies" 2015-01-10 21:22:03 -05:00
bunnei 949d95659e Merge pull request #275 from yuriks/cmake-clean
Clean up CMake library specification
2014-12-22 11:11:37 -05:00
Yuri Kunde Schlesner d261e77c16 Travis: Try to cache downloaded files to work around sf.net sucking 2014-12-20 15:56:25 -02:00
Yuri Kunde Schlesner b5d9f7364e Travis: Use gcc 4.9 instead of 4.8 since it's getting installed anyway 2014-12-15 22:07:40 -02:00
Yuri Kunde Schlesner a69afb0670 Travis: Enable tracing on the script to ease troubleshooting 2014-12-15 22:07:40 -02:00
Yuri Kunde Schlesner ea63b1a8c3 Build GLFW as a shared lib on Travis 2014-12-15 19:34:17 -02:00
Yuri Kunde Schlesner 45976da975 CMake cleanup
Several cleanups to the buildsystem:
 - Do better factoring of common libs between platforms.
 - Add support to building on Windows.
 - Remove Qt4 support.
 - Re-sort file lists and add missing headers.
2014-09-01 18:06:30 -03:00
Yuri Kunde Schlesner 478289140d Replace GLEW with a glLoadGen loader.
This should fix the GL loading errors that occur in some drivers due to
the use of deprecated functions by GLEW. Side benefits are more accurate
auto-completion (deprecated function and symbols don't exist) and faster
pointer loading (less entrypoints to load). In addition it removes an
external library depency, simplifying the build system a bit and
eliminating one set of binary libraries for Windows.
2014-09-01 17:41:56 -03:00
Sacha 90f23020f5 Add Qt5 option. Use Qt5 by default. 2014-08-19 21:34:00 +10:00
archshift 99110dc460 Travis: Added OSX, use default compilers, moved cmds into own scripts 2014-06-17 22:57:15 -07:00