summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)Author
2015-06-09force no-tab/trailing spaces with git hookLectem
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 Peyrot
2015-05-25Update bundled GLFW to 3.1.1Yuri Kunde Schlesner
It may be necessary to fix the CMake paths manually for an exsting CMake cache after this change.
2015-05-14Merge pull request #675 from jroweboy/windows-build-fixesYuri Kunde Schlesner
Windows build fixes
2015-05-13Install a .desktop file to make citra-qt launchable from DE menus.Emmanuel Gil Peyrot
2015-05-06Common: Remove many unnecessary cross-platform compatibility macrosYuri Kunde Schlesner
2015-03-26Updated the copy commands to run on post_build and use generator expressions ↵James Rowe
to simplify the code as well
2015-03-26Changes to bring the previous commits in line with the comments on thepull ↵James Rowe
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
2015-03-26More changes to the CMakeFiles for better MSVC compatibility. Added in the ↵James Rowe
RelWithDebInfo target and setup copying the Qt 5 Dlls to the output directories.
2015-03-26Small changes to the CMake file to make windows build easierJames Rowe
2015-02-03Merge pull request #483 from yuriks/cmake-fixbunnei
CMake: Inform the user when architecture auto-detection fails
2015-01-19CMake: Inform the user when architecture auto-detection failsYuri Kunde Schlesner
2015-01-13CMake: Fix wrong filename in messageYuri Kunde Schlesner
2015-01-11Fix building on MinGWdarkf
2015-01-10CMake: Consistently set _DEBUG and NDEBUG in all platformsYuri Kunde Schlesner
2015-01-10Fix Windows buildbunnei
2015-01-10Merge pull request #342 from uppfinnarn/masterbunnei
Build improvements
2015-01-09Cleanup: Remove redundant /Oi flagchinhodado
`/Oi` is included in `/Ox` already
2015-01-09Looks like that might be needed on OSX after allJohannes Ekberg
2015-01-09Use -pthread where and only where neededJohannes Ekberg
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 Ekberg
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 Ekberg
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 Schlesner
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 Schlesner
2014-12-22Merge pull request #275 from yuriks/cmake-cleanbunnei
Clean up CMake library specification
2014-12-21CMake: Silence PNG not found errorYuri Kunde Schlesner
Hopefully this will make people stop thinking it's a hard dependency.
2014-12-21CMake: Use improved optimization flags on MSVCYuri Kunde Schlesner
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 Wasserka
2014-12-20Remove C++14/1y requirementYuri Kunde Schlesner
2014-12-16Switch to C++14 to use std::make_uniqueYuri Kunde Schlesner
2014-12-15Clean up CMake library specificationYuri Kunde Schlesner
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 ↵Tony Wasserka
vertex_shader.cpp.
2014-12-01CMake: Place all the built files in BUILD_DIR/bin/<Configuration> when ↵Subv
compiling with MSVC
2014-10-07Added configuration file system.archshift
Uses QSettings on citra-qt, and inih on citra-cli.
2014-09-02Removed the need for X11 on OS Xarchshift
It only causes issues when someone (who doesn't need it) doesn't have it.
2014-09-01CMake cleanupYuri Kunde Schlesner
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 Schlesner
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 Wasserka
2014-08-19Add Qt5 option. Use Qt5 by default.Sacha
2014-08-18CMake CleanupSacha
2014-05-19* Remove -fpermissivePhillip Stephens
2014-05-19CMakeLists: Fixed GLEW include var name, compile flag varsarchshift
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-19CMakeLists: rename HEADS, improved commentsarchshift
Changes for clarity of comments, removed redundant compiler flags.
2014-05-19Indent fixesarchshift
2014-05-17Indent fixesarchshift
2014-05-16Added FindGLEW to cmake-modulesarchshift
2014-04-30Support for C++11 on OSXarchshift
2014-04-30A bit of Cmake lovearchshift
2014-04-29Some more experimentationarchshift
2014-04-28IT'S ALIVE!archshift