Commit Graph

107 Commits (16df1f8078d694ed808074010ac9a9fd57478fb6)

Author SHA1 Message Date
Yuri Kunde Schlesner a188e0fa57 Merge pull request #675 from jroweboy/windows-build-fixes
Windows build fixes
10 years ago
Emmanuel Gil Peyrot d0ee89e2fe Install a .desktop file to make citra-qt launchable from DE menus. 10 years ago
Yuri Kunde Schlesner bf12f270b3 Common: Remove many unnecessary cross-platform compatibility macros 10 years ago
James Rowe 5b9a5493c5 Updated the copy commands to run on post_build and use generator expressions to simplify the code as well 10 years ago
James Rowe 2d7008f03c 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 10 years ago
James Rowe 4a7e21eb58 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. 10 years ago
James Rowe fa79b3f4f4 Small changes to the CMake file to make windows build easier 10 years ago
bunnei a9b3f29b90 Merge pull request #483 from yuriks/cmake-fix
CMake: Inform the user when architecture auto-detection fails
10 years ago
Yuri Kunde Schlesner 8c39324333 CMake: Inform the user when architecture auto-detection fails 10 years ago
Yuri Kunde Schlesner 555c82739e CMake: Fix wrong filename in message 10 years ago
darkf 67c644e317 Fix building on MinGW 10 years ago
Yuri Kunde Schlesner 57503df97f CMake: Consistently set _DEBUG and NDEBUG in all platforms 10 years ago
bunnei e213f91373 Fix Windows build 10 years ago
bunnei e7d2118858 Merge pull request #342 from uppfinnarn/master
Build improvements
10 years ago
chinhodado f689e97380 Cleanup: Remove redundant /Oi flag
`/Oi` is included in `/Ox` already
10 years ago
Johannes Ekberg b027f7fe15 Looks like that might be needed on OSX after all 10 years ago
Johannes Ekberg d7ad14ae20 Use -pthread where and only where needed
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.
10 years ago
Johannes Ekberg 1351819810 Link Cocoa, IOKit and CoreVideo on OSX
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, ...).
10 years ago
Johannes Ekberg 7d7ab70279 Generic PLATFORM_LIBRARIES var
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.
10 years ago
Yuri Kunde Schlesner f983d955f9 CMake: Enable VS parallel builds for a good reduction in compile times
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.
10 years ago
Yuri Kunde Schlesner da04976437 CMake: Require Boost 1.57.0 (fixes Travis OS X) 10 years ago
bunnei 949d95659e Merge pull request #275 from yuriks/cmake-clean
Clean up CMake library specification
10 years ago
Yuri Kunde Schlesner 361735e7fe CMake: Silence PNG not found error
Hopefully this will make people stop thinking it's a hard dependency.
10 years ago
Yuri Kunde Schlesner ed8f32f03e CMake: Use improved optimization flags on MSVC
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.
10 years ago
Tony Wasserka 056a8f9dfa Add nihstro (a 3DS shader tools suite) as a submodule. 10 years ago
Yuri Kunde Schlesner 98a9aba46f Remove C++14/1y requirement 10 years ago
Yuri Kunde Schlesner 731b31fe97 Switch to C++14 to use std::make_unique 10 years ago
Yuri Kunde Schlesner 06f31e8b47 Clean up CMake library specification
The X11 libraries don't need to be specified when doing dynamic linking
10 years ago
Tony Wasserka 4d4572c697 Integrate Boost into build system and perform a trivial cleanup in vertex_shader.cpp. 10 years ago
Subv 8712c9dcd6 CMake: Place all the built files in BUILD_DIR/bin/<Configuration> when compiling with MSVC 10 years ago
archshift e6594f9f53 Added configuration file system.
Uses QSettings on citra-qt, and inih on citra-cli.
10 years ago
archshift 051b162add Removed the need for X11 on OS X
It only causes issues when someone (who doesn't need it) doesn't have it.
11 years ago
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.
11 years ago
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.
11 years ago
Tony Wasserka c4691b784b Pica: Add support for dumping textures. 11 years ago
Sacha 90f23020f5 Add Qt5 option. Use Qt5 by default. 11 years ago
Sacha b7ecc9543a CMake Cleanup 11 years ago
Phillip Stephens 8bfd32e854 * Remove -fpermissive 11 years ago
archshift 9216c96f48 CMakeLists: Fixed GLEW include var name, compile flag vars
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.
11 years ago
archshift 403e4bf837 CMakeLists: rename HEADS, improved comments
Changes for clarity of comments, removed redundant compiler flags.
11 years ago
archshift 71b8789803 Indent fixes 11 years ago
archshift 603ef89dad Indent fixes 11 years ago
archshift 1e729e7cae Added FindGLEW to cmake-modules 11 years ago
archshift 7817d6c79a Support for C++11 on OSX 11 years ago
archshift a7f3ed003d A bit of Cmake love 11 years ago
archshift 52377cf0d2 Some more experimentation 11 years ago
archshift 5a9c2ce5ea IT'S ALIVE! 11 years ago
Thomas Edvalson c51e4822b1 Fixed CMake's import of GLFW. 11 years ago
bunnei 15dacc4d3f removed "COVERAGE_" from "GCC_COVERAGE_COMPILE_FLAGS" 11 years ago
bunnei 80a040ac77 fixes to scm_rev generation to make it conistent with windows build 11 years ago
bunnei 4405a53cf3 added scm rev generation on Linux/cmake 11 years ago
bunnei 7a136b8a84 fixes to build on linux 11 years ago
bunnei 9527fc74ad fixed a bunch of errors in CMakeLists 11 years ago
bunnei 6b83509a7e updated CMakeLists 11 years ago
ShizZy 8bb0c457bc renamed from citrus to citra 11 years ago
ShizZy b8ca09160b renamed project to 'citrus' 11 years ago
ShizZy 27474060e1 adding initial project layout 12 years ago