f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
1c55daef2a
CMake: have funny check for empty CMAKE_SIZEOF_VOID_P
2019-03-19 09:10:25 -04:00
49dddf54ab
CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?
2019-03-19 00:04:14 -04:00
6142becb4d
Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
...
This reverts commit d03c53930b
2019-03-18 23:58:31 -04:00
d03c53930b
Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
2019-03-18 16:50:17 -04:00
78fa72514f
Implement deployer scripts for Travis -- OSX and Linux package building
2018-12-30 15:22:50 -05:00
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
9d212b340b
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
7cb0138293
Change version number to 2.1.20
2017-11-08 15:06:42 +00:00
877e9510f7
Update version number to v2.1.19
2017-05-26 21:38:49 -04:00
b8ffeeb59f
Update version number to v2.1.18
...
Don't worry, I remembered to update MODVERSION as well this time :)
2017-05-12 16:06:27 +01:00
e59fb38802
Update version number
2017-01-15 18:49:33 +00:00
b3b5521e1b
Merge branch 'master' into next
2016-02-25 18:33:29 -05:00
8a369d969b
whitespace clean
2016-02-25 18:31:40 -05:00
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
914c6c9d98
Whitespace cleanup.
2016-02-07 21:45:16 -05:00
07fc74eaf5
clang: fixup a few clang warnings
2016-02-05 22:38:40 -05:00
420a27ce11
Attempt to play nice to cmake.
2016-01-14 07:46:28 -08:00
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
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
3d5d61ee87
Remove MSVC netplay warning.
2015-03-04 20:37:37 -06:00
f28b050c07
Append current branch name to comp version string.
2015-03-04 20:15:57 -06:00
e223084982
Use bin output directory.
2015-03-04 20:07:51 -06:00
e08bd45227
cmake: Separate debug symbols on gcc
...
Only when actually making the debug target though!
2015-02-01 22:14:52 -06:00
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
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
68f8a5b0f9
cmake: build bundle and dmg on install/package
2015-01-28 19:29:16 -06:00
0909fce2e3
cmake: Configure source via cmake
...
silently fixing a bad malloc here too shhhhhhhhh
2015-01-28 18:03:41 -06:00
53799eb390
cmake: Add CPack Package Generation
...
Generates zips only at the moment
2015-01-28 16:42:05 -06:00
2f1367aab6
cmake: Fixes to allow MSVC to compile
...
running is another story
2015-01-28 02:09:03 -06:00
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
05f5ec664a
Initial CMake support pass
...
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00
dad0ad59c1
Add Linux support to CMake
2014-04-25 13:02:50 +04:00
3f170769da
Add simple CMakeLists.txt
2014-04-25 13:02:50 +04:00
Monster Iestyn