summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt (unfollow)
Commit message (Collapse)AuthorFilesLines
2016-08-16qt: Use 5.7 on Windows.bunnei1-1/+1
2016-08-05CMake: Fix for QT 5.7 overwriting -std=c++1y flagJames Rowe1-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.
2016-07-23Remove the -msse4.1 on ¬MSVC.Emmanuel Gil Peyrot1-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.
2016-06-17CMakeLists: Drop support for Qt 4Lioncash1-11/+2
2016-05-19Tests: Run tests on CIMerryMage1-0/+2
2016-05-07AudioCore: SDL2 SinkMerryMage1-0/+3
2016-04-28Externals: Add soundtouchMerryMage1-0/+3
2016-04-24CMakeLists: Use imported version of Threads::ThreadsSam Spilsbury1-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.
2016-04-23CMakeLists: Use CMAKE_THREAD_LIBS_INITSam Spilsbury1-2/+4
2016-04-03CMakeFiles: Compile as C++14Lioncash1-1/+1
2016-03-02Dependencies: Remove GLFW, Add SDL2MerryMage1-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
2015-11-12Enable RTTI on Windows builds.Tony Wasserka1-2/+1
2015-09-14CMake: Silence more MSVC "deprecation" warningsYuri Kunde Schlesner1-1/+1
2015-09-09CMake: Make all cache options appear even in case of errorsYuri Kunde Schlesner1-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.
2015-09-09CMake: Point binary downloads to new official repoYuri Kunde Schlesner1-1/+1
2015-09-09CMake: Remove support for QTDIR environment variableYuri Kunde Schlesner1-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.
2015-09-09CMake: Don't complain when Boost isn't found in the system.Yuri Kunde Schlesner1-1/+1
2015-09-09CMake: Use HINTS option instead of modifying CMAKE_PREFIX_PATH for QtYuri Kunde Schlesner1-4/+11
2015-09-09CMake: Add option to download Qt and GLFW binaries over HTTPYuri Kunde Schlesner1-45/+41
2015-09-09CMake: Fix architecture detection on MSVCYuri Kunde Schlesner1-5/+31
CMAKE_SYSTEM_ARCHICTETURE always returns the *host* not target arch when using the MSVC generators. (CMake bugs 15170 and 14342.)
2015-08-30Replace the previous OpenGL loader with a glad-generated 3.3 oneYuri Kunde Schlesner1-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.
2015-08-25Integrate the MicroProfile profiling libraryYuri Kunde Schlesner1-0/+1
This brings goodies such as a configurable user interface and multi-threaded timeline view.
2015-08-18Fix building under MinGWdarkf1-1/+2
2015-08-16Rename ARCHITECTURE_X64 definition to ARCHITECTURE_x86_64.bunnei1-13/+14
2015-08-15Common: Ported over Dolphin's code for x86 CPU capability detection.bunnei1-2/+13
2015-07-28Enable linker optimizations in MSVC Release buildsYuri Kunde Schlesner1-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.
2015-07-14Fix permissions in pre-commit hookJSFernandes1-2/+1
2015-07-12Implement new argument parsing using getopt and add the corresponding library to externalsGreg Wicks1-0/+4
2015-07-09CMake: Fix Debug build configuration in MSVCYuri Kunde Schlesner1-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.
2015-06-09force no-tab/trailing spaces with git hookLectem1-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
2015-05-29Remove every trailing whitespace from the project (but externals).Emmanuel Gil Peyrot1-2/+2
2015-05-25Update bundled GLFW to 3.1.1Yuri Kunde Schlesner1-1/+1
It may be necessary to fix the CMake paths manually for an exsting CMake cache after this change.
2015-05-13Install a .desktop file to make citra-qt launchable from DE menus.Emmanuel Gil Peyrot1-0/+13
2015-05-07Common: Remove many unnecessary cross-platform compatibility macrosYuri Kunde Schlesner1-2/+5
2015-03-26Updated the copy commands to run on post_build and use generator expressions to simplify the code as wellJames Rowe1-8/+8
2015-03-26Changes 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 timeJames Rowe1-5/+6
2015-03-26More 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 Rowe1-2/+2
2015-03-26Small changes to the CMake file to make windows build easierJames Rowe1-7/+13
2015-01-19CMake: Inform the user when architecture auto-detection failsYuri Kunde Schlesner1-2/+8
2015-01-13CMake: Fix wrong filename in messageYuri Kunde Schlesner1-1/+1
2015-01-12Fix building on MinGWdarkf1-0/+6
2015-01-10CMake: Consistently set _DEBUG and NDEBUG in all platformsYuri Kunde Schlesner1-1/+5
2015-01-10Fix Windows buildbunnei1-1/+1
2015-01-09Cleanup: Remove redundant /Oi flagchinhodado1-2/+1
`/Oi` is included in `/Ox` already
2015-01-09Looks like that might be needed on OSX after allJohannes Ekberg1-6/+2
2015-01-09Use -pthread where and only where neededJohannes Ekberg1-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.
2015-01-09Link Cocoa, IOKit and CoreVideo on OSXJohannes Ekberg1-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, ...).
2015-01-09Generic PLATFORM_LIBRARIES varJohannes Ekberg1-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.
2015-01-09CMake: Enable VS parallel builds for a good reduction in compile timesYuri Kunde Schlesner1-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.
2014-12-29CMake: Require Boost 1.57.0 (fixes Travis OS X)Yuri Kunde Schlesner1-2/+2
2014-12-22CMake: Silence PNG not found errorYuri Kunde Schlesner1-2/+4
Hopefully this will make people stop thinking it's a hard dependency.
2014-12-22CMake: Use improved optimization flags on MSVCYuri Kunde Schlesner1-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.
2014-12-20Add nihstro (a 3DS shader tools suite) as a submodule.Tony Wasserka1-0/+2
2014-12-20Remove C++14/1y requirementYuri Kunde Schlesner1-2/+1
2014-12-16Switch to C++14 to use std::make_uniqueYuri Kunde Schlesner1-1/+2
2014-12-15Clean up CMake library specificationYuri Kunde Schlesner1-4/+1
The X11 libraries don't need to be specified when doing dynamic linking
2014-12-07Integrate Boost into build system and perform a trivial cleanup in vertex_shader.cpp.Tony Wasserka1-0/+8
2014-12-02CMake: Place all the built files in BUILD_DIR/bin/<Configuration> when compiling with MSVCSubv1-0/+2
2014-10-08Added configuration file system.archshift1-1/+5
Uses QSettings on citra-qt, and inih on citra-cli.
2014-09-03Removed the need for X11 on OS Xarchshift1-1/+4
It only causes issues when someone (who doesn't need it) doesn't have it.
2014-09-01CMake cleanupYuri Kunde Schlesner1-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.
2014-09-01Replace GLEW with a glLoadGen loader.Yuri Kunde Schlesner1-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.
2014-08-25Pica: Add support for dumping textures.Tony Wasserka1-0/+5
2014-08-19Add Qt5 option. Use Qt5 by default.Sacha1-13/+26
2014-08-18CMake CleanupSacha1-1/+1
2014-05-20* Remove -fpermissivePhillip Stephens1-1/+1
2014-05-20CMakeLists: Fixed GLEW include var name, compile flag varsarchshift1-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.
2014-05-20CMakeLists: rename HEADS, improved commentsarchshift1-3/+2
Changes for clarity of comments, removed redundant compiler flags.
2014-05-19Indent fixesarchshift1-1/+1
2014-05-17Indent fixesarchshift1-1/+1
2014-05-17Added FindGLEW to cmake-modulesarchshift1-1/+1
2014-05-01Support for C++11 on OSXarchshift1-3/+2
2014-05-01A bit of Cmake lovearchshift1-4/+7
2014-04-30Some more experimentationarchshift1-1/+5
2014-04-29IT'S ALIVE!archshift1-2/+9
2014-04-25Fixed CMake's import of GLFW.Thomas Edvalson1-0/+2
2014-04-24removed "COVERAGE_" from "GCC_COVERAGE_COMPILE_FLAGS"bunnei1-2/+2
2014-04-24fixes to scm_rev generation to make it conistent with windows buildbunnei1-0/+1
2014-04-24added scm rev generation on Linux/cmakebunnei1-0/+6
2014-04-23fixes to build on linuxbunnei1-0/+3
2014-04-10fixed a bunch of errors in CMakeListsbunnei1-8/+1
2014-04-10updated CMakeListsbunnei1-3/+1
2013-09-26renamed from citrus to citraShizZy1-2/+2
2013-09-14renamed project to 'citrus'ShizZy1-3/+2
2013-08-30adding initial project layoutShizZy1-0/+49
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 05:04:09 +0100