Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | CMake: Re-organize root CMakeLists.txt file | Yuri Kunde Schlesner | 2017-05-28 | 1 | -56/+78 |
| | | | | Separates the file into sections and re-orders things to fit in them | ||||
* | CMake: Move definitions of externals to the CMakeLists in that directory | Yuri Kunde Schlesner | 2017-05-28 | 1 | -26/+5 |
| | |||||
* | CMake: Create INTERFACE targets for microprofile and nihstro | Yuri Kunde Schlesner | 2017-05-28 | 1 | -2/+6 |
| | |||||
* | CMake: Add SoundTouch include path to target property | Yuri Kunde Schlesner | 2017-05-28 | 1 | -0/+2 |
| | |||||
* | CMake: Use target properties to add inih include paths | Yuri Kunde Schlesner | 2017-05-28 | 1 | -3/+1 |
| | |||||
* | CMake: Define an interface target for SDL2 definitions | Yuri Kunde Schlesner | 2017-05-28 | 1 | -0/+7 |
| | |||||
* | CMake: Remove CITRA_QT_LIBS var | Yuri Kunde Schlesner | 2017-05-28 | 1 | -1/+0 |
| | | | | | This used to be required to support both Qt4 and Qt5, but we dropped Qt4 so it's not needed anymore. | ||||
* | CMake: Stop using FindOpenGL, which seems to not be required anymore | Yuri Kunde Schlesner | 2017-05-28 | 1 | -3/+0 |
| | |||||
* | CMake: Use append instead of set to modify list | Yuri Kunde Schlesner | 2017-05-28 | 1 | -1/+1 |
| | |||||
* | CMake: Use IMPORTED target for Boost | Yuri Kunde Schlesner | 2017-05-28 | 1 | -6/+8 |
| | |||||
* | CMake: Use IMPORTED target for libpng | Yuri Kunde Schlesner | 2017-05-28 | 1 | -5/+3 |
| | |||||
* | Add the fmt string formatting library | Yuri Kunde Schlesner | 2017-05-27 | 1 | -0/+1 |
| | | | | | | | More info at http://fmtlib.net/ This commit was based on @jroweboy's work on his spdlog branch, but with modifications. | ||||
* | Fix Microprofile in MinGW (#2530) | Fernando Sahmkow | 2017-02-05 | 1 | -2/+0 |
| | |||||
* | Removed unused and outdated external qhexedit | Kloen | 2017-01-22 | 1 | -5/+0 |
| | |||||
* | Change deploy to use github releases instead, but only for the citra-nightly repo | James Rowe | 2017-01-05 | 1 | -5/+0 |
| | |||||
* | Add deploy to bintray for builds to master | James Rowe | 2016-12-31 | 1 | -0/+5 |
| | |||||
* | Merge pull request #2303 from freiro/citra-qt_missing_sdl2_dll | bunnei | 2016-12-16 | 1 | -0/+1 |
|\ | | | | | Copy SDL2.dll when compiling citra-qt with msvc | ||||
| * | Modularization of copy_msvc_libraries cmake funct | freiro | 2016-12-11 | 1 | -0/+1 |
| | | | | | | | | | | Created a new folder in Citra's root called CMakeModules that should contain cmake functions used by the various CMakeLists.txt. | ||||
* | | Externals: Add Xbyak | Yuri Kunde Schlesner | 2016-12-15 | 1 | -0/+2 |
| | | |||||
* | | CMakeLists: Autodetect clang and only then use libc++ | Jeffrey Pfau | 2016-12-13 | 1 | -2/+4 |
|/ | |||||
* | Merge pull request #2202 from j-selby/man-docs | Yuri Kunde Schlesner | 2016-12-09 | 1 | -0/+12 |
|\ | | | | | Add man documentation | ||||
| * | Add man documentation | James | 2016-11-26 | 1 | -0/+12 |
| | | | | | | | | Includes both SDL and QT frontends | ||||
* | | Disable Microprofile on Mingw builds | James | 2016-12-05 | 1 | -0/+3 |
| | | | | | | | | This fixes a crash when starting games | ||||
* | | Appending PLATFORM_LIBRARIES instead of redefining them | freiro | 2016-11-30 | 1 | -3/+3 |
| | | |||||
* | | WINVER definition moved to CMake and cleanup | freiro | 2016-11-30 | 1 | -8/+8 |
|/ | |||||
* | Move to SDL2-2.0.5 | freiro | 2016-11-22 | 1 | -1/+1 |
| | |||||
* | Add mingw compile support | James Rowe | 2016-11-14 | 1 | -1/+10 |
| | |||||
* | build: don't install freedesktop.org metadata for SDL2-only builds | Jan Beich | 2016-10-28 | 1 | -1/+1 |
| | | | | | | | Citra SDL2 doesn't have a launcher, and citra.desktop tries to execute citra-qt which is N/A unless built with ENABLE_QT. Limiting installed files to one of the options also makes it easier to split them into separate non-conflicting packages downstream. | ||||
* | build: add default install for DragonFly, Solaris, etc. | Jan Beich | 2016-10-28 | 1 | -1/+1 |
| | |||||
* | build: clock_gettime() is in libc on BSDs | Jan Beich | 2016-10-28 | 1 | -1/+1 |
| | |||||
* | build: libc may not provide iconv() on Unix | Jan Beich | 2016-10-28 | 1 | -3/+10 |
| | | | | /usr/bin/ld: ../common/libcommon.a(string_util.cpp.o): undefined reference to symbol 'libiconv_open' | ||||
* | common: convert to standard stat()/fstat() interfaces | Anthony J. Bentley | 2016-10-28 | 1 | -0/+9 |
| | | | | | | | | | | | | | Most modern Unix environments use 64-bit off_t by default: OpenBSD, FreeBSD, OS X, and Linux libc implementations such as Musl. glibc is the lone exception; it can default to 32 bits but this is configurable by setting _FILE_OFFSET_BITS. Avoiding the stat64()/fstat64() interfaces is desirable because they are nonstandard and not implemented on many systems (including OpenBSD and FreeBSD), and using 64 bits for stat()/fstat() is either the default or trivial to set up. | ||||
* | dynarmic: Add new submodule. | bunnei | 2016-09-15 | 1 | -0/+3 |
| | |||||
* | CMakeLists: Set Boost_INCLUDE_DIR. | bunnei | 2016-09-15 | 1 | -4/+3 |
| | |||||
* | Revert "MSVC: Add RelWithDebInfo and removing debugging from Release." | bunnei | 2016-09-01 | 1 | -11/+7 |
| | |||||
* | MSVC: Add RelWithDebInfo and removing debugging from Release. | James Rowe | 2016-09-01 | 1 | -7/+11 |
| | | | | This should reduce build size on windows from roughly 12MB compressed to 7MB | ||||
* | qt: Use 5.7 on Windows. | bunnei | 2016-08-16 | 1 | -1/+1 |
| | |||||
* | CMake: Fix for QT 5.7 overwriting -std=c++1y flag | James Rowe | 2016-08-05 | 1 | -4/+6 |
| | | | | | | | 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. | ||||
* | Remove the -msse4.1 on ¬MSVC. | Emmanuel Gil Peyrot | 2016-07-23 | 1 | -5/+0 |
| | | | | | | | This option makes the generated binary crash with an illegal instruction when the target CPU doesn’t support the SSE4.1 extension (see #1968), with no noticeable performance increase compared to a generic build. | ||||
* | CMakeLists: Drop support for Qt 4 | Lioncash | 2016-06-17 | 1 | -11/+2 |
| | |||||
* | Tests: Run tests on CI | MerryMage | 2016-05-19 | 1 | -0/+2 |
| | |||||
* | AudioCore: SDL2 Sink | MerryMage | 2016-05-07 | 1 | -0/+3 |
| | |||||
* | Externals: Add soundtouch | MerryMage | 2016-04-28 | 1 | -0/+3 |
| | |||||
* | CMakeLists: Use imported version of Threads::Threads | Sam Spilsbury | 2016-04-24 | 1 | -3/+5 |
| | | | | | | | This requires bumping up to a minimum of CMake 3.1. The benefit of using the imported target is that you can switch to the -pthread compiler flag on request, which may be necessary for some systems if available. | ||||
* | CMakeLists: Use CMAKE_THREAD_LIBS_INIT | Sam Spilsbury | 2016-04-23 | 1 | -2/+4 |
| | |||||
* | CMakeFiles: Compile as C++14 | Lioncash | 2016-04-03 | 1 | -1/+1 |
| | |||||
* | Dependencies: Remove GLFW, Add SDL2 | MerryMage | 2016-03-02 | 1 | -17/+12 |
| | | | | | | | | | | | | | | 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 | ||||
* | Enable RTTI on Windows builds. | Tony Wasserka | 2015-11-12 | 1 | -2/+1 |
| | |||||
* | CMake: Silence more MSVC "deprecation" warnings | Yuri Kunde Schlesner | 2015-09-14 | 1 | -1/+1 |
| | |||||
* | CMake: Make all cache options appear even in case of errors | Yuri Kunde Schlesner | 2015-09-09 | 1 | -5/+7 |
| | | | | | | | | The `option` commands have been moved to the top of the file, so that the relevant options are registered in the CMake cache even if one of the required libraries is not found. This solves an ergonomic problem when using bundled libraries where you have to first download GLFW before being able to select the option to also download Qt. | ||||
* | CMake: Point binary downloads to new official repo | Yuri Kunde Schlesner | 2015-09-09 | 1 | -1/+1 |
| | |||||
* | CMake: Remove support for QTDIR environment variable | Yuri Kunde Schlesner | 2015-09-09 | 1 | -8/+2 |
| | | | | | | | | | | | Using this variable is problematic is the user has several versions of Qt installed on their system. There is no way to know ahead of time if the Qt version pointed to by QTDIR matches the toolchain that is being targeted. The Qt installation path can still be easily specified if it's not found by CMake by setting the Qt5_DIR cache variable after the initial configuration run, so this shouldn't present an usability issue. | ||||
* | CMake: Don't complain when Boost isn't found in the system. | Yuri Kunde Schlesner | 2015-09-09 | 1 | -1/+1 |
| | |||||
* | CMake: Use HINTS option instead of modifying CMAKE_PREFIX_PATH for Qt | Yuri Kunde Schlesner | 2015-09-09 | 1 | -4/+11 |
| | |||||
* | CMake: Add option to download Qt and GLFW binaries over HTTP | Yuri Kunde Schlesner | 2015-09-09 | 1 | -45/+41 |
| | |||||
* | CMake: Fix architecture detection on MSVC | Yuri Kunde Schlesner | 2015-09-09 | 1 | -5/+31 |
| | | | | | CMAKE_SYSTEM_ARCHICTETURE always returns the *host* not target arch when using the MSVC generators. (CMake bugs 15170 and 14342.) | ||||
* | Replace the previous OpenGL loader with a glad-generated 3.3 one | Yuri Kunde Schlesner | 2015-08-30 | 1 | -0/+1 |
| | | | | | | The main advantage of switching to glad from glLoadGen is that, apart from being actively maintained, it supports a customizable entrypoint loader function, which makes it possible to also support OpenGL ES. | ||||
* | Integrate the MicroProfile profiling library | Yuri Kunde Schlesner | 2015-08-25 | 1 | -0/+1 |
| | | | | | This brings goodies such as a configurable user interface and multi-threaded timeline view. | ||||
* | Fix building under MinGW | darkf | 2015-08-18 | 1 | -1/+2 |
| | |||||
* | Rename ARCHITECTURE_X64 definition to ARCHITECTURE_x86_64. | bunnei | 2015-08-16 | 1 | -13/+14 |
| | |||||
* | Common: Ported over Dolphin's code for x86 CPU capability detection. | bunnei | 2015-08-15 | 1 | -2/+13 |
| | |||||
* | Enable linker optimizations in MSVC Release builds | Yuri Kunde Schlesner | 2015-07-28 | 1 | -1/+1 |
| | | | | | | Apparently /DEBUG implicitly disables linker optimizations. This explicitly re-enables them, giving a 40% reduction in binary sizes and a very slight runtime speed improvement. | ||||
* | Fix permissions in pre-commit hook | JSFernandes | 2015-07-14 | 1 | -2/+1 |
| | |||||
* | Implement new argument parsing using getopt and add the corresponding library to externals | Greg Wicks | 2015-07-12 | 1 | -0/+4 |
| | |||||
* | CMake: Fix Debug build configuration in MSVC | Yuri Kunde Schlesner | 2015-07-09 | 1 | -15/+17 |
| | | | | | | | | Debug was missing compiler flags, causing MSVC to default it to building with optimizations enabled (making for a not very useful binary for actual debugging...). Additionally, the variables were re-organized to remove some redundancy, the old Release build type was removed, and RelWithDebInfo was renamed to take its place instead. | ||||
* | Merge pull request #839 from Lectem/whitespacepolicy | Yuri Kunde Schlesner | 2015-06-21 | 1 | -0/+7 |
|\ | | | | | Enforce the "no tab, use spaces" policy with a pre-commit hook. | ||||
| * | force no-tab/trailing spaces with git hook | Lectem | 2015-06-09 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | Remove unneeded stuff from pre-commit script The check against an empty commit was not needed (it is only a security for the 1st commit after git init). It could also possibly pose problems because of the redirection to /dev/null on some windows systems. newline at EOF & fixed indent | ||||
* | | Remove every trailing whitespace from the project (but externals). | Emmanuel Gil Peyrot | 2015-05-29 | 1 | -2/+2 |
| | | |||||
* | | Update bundled GLFW to 3.1.1 | Yuri Kunde Schlesner | 2015-05-25 | 1 | -1/+1 |
|/ | | | | | It may be necessary to fix the CMake paths manually for an exsting CMake cache after this change. | ||||
* | Merge pull request #675 from jroweboy/windows-build-fixes | Yuri Kunde Schlesner | 2015-05-15 | 1 | -8/+15 |
|\ | | | | | Windows build fixes | ||||
| * | Updated the copy commands to run on post_build and use generator expressions to simplify the code as well | James Rowe | 2015-03-26 | 1 | -8/+8 |
| | | |||||
| * | Changes to bring the previous commits in line with the comments on thepull request. Made the debug build a true debug build with no optimizxations and the RelWithDebInfo is what it says it is too. Changed the copying of the dlls to the build directories to happen at configuration time instead of build time | James Rowe | 2015-03-26 | 1 | -5/+6 |
| | | |||||
| * | More changes to the CMakeFiles for better MSVC compatibility. Added in the RelWithDebInfo target and setup copying the Qt 5 Dlls to the output directories. | James Rowe | 2015-03-26 | 1 | -2/+2 |
| | | |||||
| * | Small changes to the CMake file to make windows build easier | James Rowe | 2015-03-26 | 1 | -7/+13 |
| | | |||||
* | | Install a .desktop file to make citra-qt launchable from DE menus. | Emmanuel Gil Peyrot | 2015-05-13 | 1 | -0/+13 |
| | | |||||
* | | Common: Remove many unnecessary cross-platform compatibility macros | Yuri Kunde Schlesner | 2015-05-07 | 1 | -2/+5 |
|/ | |||||
* | Merge pull request #483 from yuriks/cmake-fix | bunnei | 2015-02-03 | 1 | -3/+9 |
|\ | | | | | CMake: Inform the user when architecture auto-detection fails | ||||
| * | CMake: Inform the user when architecture auto-detection fails | Yuri Kunde Schlesner | 2015-01-19 | 1 | -2/+8 |
| | | |||||
| * | CMake: Fix wrong filename in message | Yuri Kunde Schlesner | 2015-01-13 | 1 | -1/+1 |
| | | |||||
* | | Fix building on MinGW | darkf | 2015-01-12 | 1 | -0/+6 |
|/ | |||||
* | CMake: Consistently set _DEBUG and NDEBUG in all platforms | Yuri Kunde Schlesner | 2015-01-10 | 1 | -1/+5 |
| | |||||
* | Fix Windows build | bunnei | 2015-01-10 | 1 | -1/+1 |
| | |||||
* | Merge pull request #342 from uppfinnarn/master | bunnei | 2015-01-10 | 1 | -4/+11 |
|\ | | | | | Build improvements | ||||
| * | Looks like that might be needed on OSX after all | Johannes Ekberg | 2015-01-09 | 1 | -6/+2 |
| | | |||||
| * | Use -pthread where and only where needed | Johannes Ekberg | 2015-01-09 | 1 | -1/+5 |
| | | | | | | | | | | | | Passing -pthread to GCC as a flag makes it both link to libpthread, and make C standard library routines reentrant. This makes the additional explicit links unnecessary. Additionally, on OSX, this is the default behavior, and clang will print a message about it being unused if it's present there. | ||||
| * | Link Cocoa, IOKit and CoreVideo on OSX | Johannes Ekberg | 2015-01-09 | 1 | -3/+4 |
| | | | | | | | | | | | | These are implicitly linked by Xcode, but with this, you can also build it with any other generator, which does not have this behavior. CoreFoundation is included as a part of Cocoa (which is an umbrella framework), and Cocoa is generally recommended to link against, rather than its individual components (CoreFoundation, Foundation, libobjc, ...). | ||||
| * | Generic PLATFORM_LIBRARIES var | Johannes Ekberg | 2015-01-09 | 1 | -0/+6 |
| | | | | | | | | This both reduces redundancy in add_executable definitions, and makes it easier to link additional libraries. In particular, extra libraries are needed on OSX - see next commit. | ||||
* | | Cleanup: Remove redundant /Oi flag | chinhodado | 2015-01-09 | 1 | -2/+1 |
| | | | | | | `/Oi` is included in `/Ox` already | ||||
* | | CMake: Enable VS parallel builds for a good reduction in compile times | Yuri Kunde Schlesner | 2015-01-09 | 1 | -1/+2 |
|/ | | | | | | | | This enables the /MP compiler flag, which parallelizes builds of by distributing compilation of individual object files across workes processes, instead of being limited to per-project parallelism. Reduces the time for a full compile from 72 s to 45 s on my machine. | ||||
* | CMake: Require Boost 1.57.0 (fixes Travis OS X) | Yuri Kunde Schlesner | 2014-12-29 | 1 | -2/+2 |
| | |||||
* | Merge pull request #275 from yuriks/cmake-clean | bunnei | 2014-12-22 | 1 | -4/+1 |
|\ | | | | | Clean up CMake library specification | ||||
| * | Clean up CMake library specification | Yuri Kunde Schlesner | 2014-12-15 | 1 | -4/+1 |
| | | | | | | | | The X11 libraries don't need to be specified when doing dynamic linking | ||||
* | | CMake: Silence PNG not found error | Yuri Kunde Schlesner | 2014-12-22 | 1 | -2/+4 |
| | | | | | | | | Hopefully this will make people stop thinking it's a hard dependency. | ||||
* | | CMake: Use improved optimization flags on MSVC | Yuri Kunde Schlesner | 2014-12-22 | 1 | -0/+19 |
| | | | | | | | | | | | | While not having a noticeable effect on CPU-bound applications, this change gives an about 30-50% increase in performance for games using the GPU. | ||||
* | | Add nihstro (a 3DS shader tools suite) as a submodule. | Tony Wasserka | 2014-12-20 | 1 | -0/+2 |
| | | |||||
* | | Remove C++14/1y requirement | Yuri Kunde Schlesner | 2014-12-20 | 1 | -2/+1 |
| | | |||||
* | | Switch to C++14 to use std::make_unique | Yuri Kunde Schlesner | 2014-12-16 | 1 | -1/+2 |
|/ | |||||
* | Integrate Boost into build system and perform a trivial cleanup in vertex_shader.cpp. | Tony Wasserka | 2014-12-07 | 1 | -0/+8 |
| | |||||
* | CMake: Place all the built files in BUILD_DIR/bin/<Configuration> when compiling with MSVC | Subv | 2014-12-02 | 1 | -0/+2 |
| | |||||
* | Added configuration file system. | archshift | 2014-10-08 | 1 | -1/+5 |
| | | | | Uses QSettings on citra-qt, and inih on citra-cli. | ||||
* | Removed the need for X11 on OS X | archshift | 2014-09-03 | 1 | -1/+4 |
| | | | | It only causes issues when someone (who doesn't need it) doesn't have it. | ||||
* | CMake cleanup | Yuri Kunde Schlesner | 2014-09-01 | 1 | -46/+99 |
| | | | | | | | | 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. | ||||
* | Replace GLEW with a glLoadGen loader. | Yuri Kunde Schlesner | 2014-09-01 | 1 | -2/+0 |
| | | | | | | | | | 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. | ||||
* | Pica: Add support for dumping textures. | Tony Wasserka | 2014-08-25 | 1 | -0/+5 |
| | |||||
* | Add Qt5 option. Use Qt5 by default. | Sacha | 2014-08-19 | 1 | -13/+26 |
| | |||||
* | CMake Cleanup | Sacha | 2014-08-18 | 1 | -1/+1 |
| | |||||
* | * Remove -fpermissive | Phillip Stephens | 2014-05-20 | 1 | -1/+1 |
| | |||||
* | CMakeLists: Fixed GLEW include var name, compile flag vars | archshift | 2014-05-20 | 1 | -5/+5 |
| | | | | | | After adding FindGLEW.cmake to externals, the variable call for the GLEW include path needed to be revised. Append flags on OSX, rather than overwrite them. I realized that GCC_COMPILE_FLAGS was changed to CMAKE_CXX_FLAGS mistakenly, so both were changed to a more platform-independent name. | ||||
* | CMakeLists: rename HEADS, improved comments | archshift | 2014-05-20 | 1 | -3/+2 |
| | | | | Changes for clarity of comments, removed redundant compiler flags. | ||||
* | Indent fixes | archshift | 2014-05-19 | 1 | -1/+1 |
| | |||||
* | Indent fixes | archshift | 2014-05-17 | 1 | -1/+1 |
| | |||||
* | Added FindGLEW to cmake-modules | archshift | 2014-05-17 | 1 | -1/+1 |
| | |||||
* | Support for C++11 on OSX | archshift | 2014-05-01 | 1 | -3/+2 |
| | |||||
* | A bit of Cmake love | archshift | 2014-05-01 | 1 | -4/+7 |
| | |||||
* | Some more experimentation | archshift | 2014-04-30 | 1 | -1/+5 |
| | |||||
* | IT'S ALIVE! | archshift | 2014-04-29 | 1 | -2/+9 |
| | |||||
* | Fixed CMake's import of GLFW. | Thomas Edvalson | 2014-04-25 | 1 | -0/+2 |
| | |||||
* | removed "COVERAGE_" from "GCC_COVERAGE_COMPILE_FLAGS" | bunnei | 2014-04-24 | 1 | -2/+2 |
| | |||||
* | fixes to scm_rev generation to make it conistent with windows build | bunnei | 2014-04-24 | 1 | -0/+1 |
| | |||||
* | added scm rev generation on Linux/cmake | bunnei | 2014-04-24 | 1 | -0/+6 |
| | |||||
* | fixes to build on linux | bunnei | 2014-04-23 | 1 | -0/+3 |
| | |||||
* | fixed a bunch of errors in CMakeLists | bunnei | 2014-04-10 | 1 | -8/+1 |
| | |||||
* | updated CMakeLists | bunnei | 2014-04-10 | 1 | -3/+1 |
| | |||||
* | renamed from citrus to citra | ShizZy | 2013-09-26 | 1 | -2/+2 |
| | |||||
* | renamed project to 'citrus' | ShizZy | 2013-09-14 | 1 | -3/+2 |
| | |||||
* | adding initial project layout | ShizZy | 2013-08-30 | 1 | -0/+49 |