Alam Ed Arias
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
Yukita Mayako
914c6c9d98
Whitespace cleanup.
2016-02-07 21:45:16 -05:00
Alam Ed Arias
07fc74eaf5
clang: fixup a few clang warnings
2016-02-05 22:38:40 -05:00
Inuyasha
420a27ce11
Attempt to play nice to cmake.
2016-01-14 07:46:28 -08:00
Ronald Kinard
53680903e5
Fix compilation and debugging on Windows.
...
Core code has too many #define dependencies on interface-specific
defines. This means that it's currently not possible to safely
separate the core and interface code into different contexts. The
core code should be refactored to accomadate for this because we
should not have any interface-specific code in core in the first
place.
This reverts the static library SRB2Core from a7135094
2015-03-24 19:32:58 -05:00
Ronald Kinard
2f52a5d34f
Added a fatal error message when attempting an in-source build.
...
In-source builds are pain and suffering and I am going to stop people
from doing them to save them that pain.
2015-03-08 18:47:26 -05:00
Ronald Kinard
3d5d61ee87
Remove MSVC netplay warning.
2015-03-04 20:37:37 -06:00
Ronald Kinard
f28b050c07
Append current branch name to comp version string.
2015-03-04 20:15:57 -06:00
Ronald Kinard
e223084982
Use bin output directory.
2015-03-04 20:07:51 -06:00
Ronald Kinard
e08bd45227
cmake: Separate debug symbols on gcc
...
Only when actually making the debug target though!
2015-02-01 22:14:52 -06:00
Ronald Kinard
ec79756c42
cmake: copy DLLs to build directory in MSVC
...
this is done as a POST_BUILD step
2015-01-31 22:40:36 -06:00
Ronald Kinard
70f046a320
cmake: on mac, check Resources in bundle first.
...
on non debug, check assets folder in src as well
2015-01-28 23:38:40 -06:00
Ronald Kinard
68f8a5b0f9
cmake: build bundle and dmg on install/package
2015-01-28 19:29:16 -06:00
Ronald Kinard
0909fce2e3
cmake: Configure source via cmake
...
silently fixing a bad malloc here too shhhhhhhhh
2015-01-28 18:03:41 -06:00
Ronald Kinard
53799eb390
cmake: Add CPack Package Generation
...
Generates zips only at the moment
2015-01-28 16:42:05 -06:00
Ronald Kinard
2f1367aab6
cmake: Fixes to allow MSVC to compile
...
running is another story
2015-01-28 02:09:03 -06:00
Ronald Kinard
479ebc3f94
Add Xcode target support
...
It is really messy at the moment. There is no support for copying the
necessary frameworks and dylibs out to the bundle for distribution, and
it is a frankenstein of manual find_library and find_package which can
sometimes pick up Homebrew dylibs.
2015-01-28 00:58:30 -06:00
Ronald Kinard
05f5ec664a
Initial CMake support pass
...
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00
Dmitry Marakasov
dad0ad59c1
Add Linux support to CMake
2014-04-25 13:02:50 +04:00
Dmitry Marakasov
3f170769da
Add simple CMakeLists.txt
2014-04-25 13:02:50 +04:00
