summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix permissions in pre-commit hookJSFernandes2015-07-141-2/+1
|
* Implement new argument parsing using getopt and add the corresponding library to externalsGreg Wicks2015-07-121-0/+4
|
* CMake: Fix Debug build configuration in MSVCYuri Kunde Schlesner2015-07-091-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/whitespacepolicyYuri Kunde Schlesner2015-06-211-0/+7
|\ | | | | Enforce the "no tab, use spaces" policy with a pre-commit hook.
| * force no-tab/trailing spaces with git hookLectem2015-06-091-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 Peyrot2015-05-291-2/+2
| |
* | Update bundled GLFW to 3.1.1Yuri Kunde Schlesner2015-05-251-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-fixesYuri Kunde Schlesner2015-05-151-8/+15
|\ | | | | Windows build fixes
| * Updated the copy commands to run on post_build and use generator expressions to simplify the code as wellJames Rowe2015-03-261-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 timeJames Rowe2015-03-261-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 Rowe2015-03-261-2/+2
| |
| * Small changes to the CMake file to make windows build easierJames Rowe2015-03-261-7/+13
| |
* | Install a .desktop file to make citra-qt launchable from DE menus.Emmanuel Gil Peyrot2015-05-131-0/+13
| |
* | Common: Remove many unnecessary cross-platform compatibility macrosYuri Kunde Schlesner2015-05-071-2/+5
|/
* Merge pull request #483 from yuriks/cmake-fixbunnei2015-02-031-3/+9
|\ | | | | CMake: Inform the user when architecture auto-detection fails
| * CMake: Inform the user when architecture auto-detection failsYuri Kunde Schlesner2015-01-191-2/+8
| |
| * CMake: Fix wrong filename in messageYuri Kunde Schlesner2015-01-131-1/+1
| |
* | Fix building on MinGWdarkf2015-01-121-0/+6
|/
* CMake: Consistently set _DEBUG and NDEBUG in all platformsYuri Kunde Schlesner2015-01-101-1/+5
|
* Fix Windows buildbunnei2015-01-101-1/+1
|
* Merge pull request #342 from uppfinnarn/masterbunnei2015-01-101-4/+11
|\ | | | | Build improvements
| * Looks like that might be needed on OSX after allJohannes Ekberg2015-01-091-6/+2
| |
| * Use -pthread where and only where neededJohannes Ekberg2015-01-091-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 OSXJohannes Ekberg2015-01-091-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 varJohannes Ekberg2015-01-091-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 flagchinhodado2015-01-091-2/+1
| | | | | | `/Oi` is included in `/Ox` already
* | CMake: Enable VS parallel builds for a good reduction in compile timesYuri Kunde Schlesner2015-01-091-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 Schlesner2014-12-291-2/+2
|
* Merge pull request #275 from yuriks/cmake-cleanbunnei2014-12-221-4/+1
|\ | | | | Clean up CMake library specification
| * Clean up CMake library specificationYuri Kunde Schlesner2014-12-151-4/+1
| | | | | | | | The X11 libraries don't need to be specified when doing dynamic linking
* | CMake: Silence PNG not found errorYuri Kunde Schlesner2014-12-221-2/+4
| | | | | | | | Hopefully this will make people stop thinking it's a hard dependency.
* | CMake: Use improved optimization flags on MSVCYuri Kunde Schlesner2014-12-221-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 Wasserka2014-12-201-0/+2
| |
* | Remove C++14/1y requirementYuri Kunde Schlesner2014-12-201-2/+1
| |
* | Switch to C++14 to use std::make_uniqueYuri Kunde Schlesner2014-12-161-1/+2
|/
* Integrate Boost into build system and perform a trivial cleanup in vertex_shader.cpp.Tony Wasserka2014-12-071-0/+8
|
* CMake: Place all the built files in BUILD_DIR/bin/<Configuration> when compiling with MSVCSubv2014-12-021-0/+2
|
* Added configuration file system.archshift2014-10-081-1/+5
| | | | Uses QSettings on citra-qt, and inih on citra-cli.
* Removed the need for X11 on OS Xarchshift2014-09-031-1/+4
| | | | It only causes issues when someone (who doesn't need it) doesn't have it.
* CMake cleanupYuri Kunde Schlesner2014-09-011-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 Schlesner2014-09-011-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 Wasserka2014-08-251-0/+5
|
* Add Qt5 option. Use Qt5 by default.Sacha2014-08-191-13/+26
|
* CMake CleanupSacha2014-08-181-1/+1
|
* * Remove -fpermissivePhillip Stephens2014-05-201-1/+1
|
* CMakeLists: Fixed GLEW include var name, compile flag varsarchshift2014-05-201-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 commentsarchshift2014-05-201-3/+2
| | | | Changes for clarity of comments, removed redundant compiler flags.
* Indent fixesarchshift2014-05-191-1/+1
|
* Indent fixesarchshift2014-05-171-1/+1
|
* Added FindGLEW to cmake-modulesarchshift2014-05-171-1/+1
|
* Support for C++11 on OSXarchshift2014-05-011-3/+2
|
* A bit of Cmake lovearchshift2014-05-011-4/+7
|
* Some more experimentationarchshift2014-04-301-1/+5
|
* IT'S ALIVE!archshift2014-04-291-2/+9
|
* Fixed CMake's import of GLFW.Thomas Edvalson2014-04-251-0/+2
|
* removed "COVERAGE_" from "GCC_COVERAGE_COMPILE_FLAGS"bunnei2014-04-241-2/+2
|
* fixes to scm_rev generation to make it conistent with windows buildbunnei2014-04-241-0/+1
|
* added scm rev generation on Linux/cmakebunnei2014-04-241-0/+6
|
* fixes to build on linuxbunnei2014-04-231-0/+3
|
* fixed a bunch of errors in CMakeListsbunnei2014-04-101-8/+1
|
* updated CMakeListsbunnei2014-04-101-3/+1
|
* renamed from citrus to citraShizZy2013-09-261-2/+2
|
* renamed project to 'citrus'ShizZy2013-09-141-3/+2
|
* adding initial project layoutShizZy2013-08-301-0/+49