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
c43b41e183
Fix generation of SRB2DD target.
...
It still won't compile correctly. But this should avoid the error
messages related to it.
2015-03-08 04:30:07 -05:00
8472075960
Prepend ASM sources with the current source directory in CMake.
...
This fixes generation with USEASM enabled.
2015-03-08 04:16:16 -05:00
a713509493
Refactor CMake to allow source grouping and separation of interfaces.
...
Core and SDL2 are two separate targets now. Core is a static library
that is linked into SRB2SDL2. The sources for both are separated.
When using an IDE like Visual Studio or Xcode, the source code
organized into groups that explain what that group of sources does.
In the future, "Main" could be split into a few more groups based on
file prefixes, but I think the way it is set up works for now.
Makefile targets are not affected by source_groups and typing `make`
will automatically compile both the "Core" library and SRB2SDL2
itself.
2015-03-08 03:26:54 -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
2609745b51
it was me, Duo!
2015-02-06 10:22:16 -05:00
ed0d70feca
do not typedef off_t when we do not need to
2015-02-05 17:32:27 -05:00
542295c863
remove comptime.h from cmake file list
2015-02-05 17:32:26 -05:00
01d441e6c0
Merge remote-tracking branch 'Furyhunter/ipv6-osx-fix'
2015-02-05 17:04:54 -05:00
8cccfa558a
do not include anything in assets folder unless forced
2015-02-05 17:04:24 -05:00
062a746fdd
Further fix IPv4 when IPv6 is available
2015-02-05 15:36:07 -06:00
ae05613460
Fix IPv4 connectivity when IPv6 is enabled
2015-02-05 00:32:54 -06:00
3d498fe894
VERSIONSTRINGW is funny
2015-02-02 15:21:58 -05:00
7cf1a1aab8
fixup cmake merge
2015-02-02 14:58:51 -05:00
244fb0b2b5
Merge remote-tracking branch 'Furyhunter/cmake-update'
2015-02-02 12:52:51 -05:00
e08bd45227
cmake: Separate debug symbols on gcc
...
Only when actually making the debug target though!
2015-02-01 22:14:52 -06:00
d7015d1492
cmake: Fix nasm/add yasm support
...
Tested to work on MSVC, mingw-gcc
2015-02-01 21:25:02 -06:00
194ce626e1
cmake: Add nasm support
...
Enables ASM-NASM and adds tmap*.nas to sdl target.
No idea if this actually works.
2015-02-01 19:18:25 -06:00
8d3b948e1b
cmake: Fix compilation for MSVC 2015
...
snprintf is now available in MSVC 2015!
2015-02-01 19:02:08 -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
4d3a7dd8fb
cmake: fix NDEBUG on Debug
...
wow i'm stupid
2015-01-29 00:17:47 -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
e54338ef01
cmake: fix Windows linking
2015-01-28 23:20:21 -06:00
57037e4124
cmake: fixes to enable linux compilation
...
string.c, capitalization, find fixes
2015-01-28 20:15:24 +00: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
1c9de50ad2
cmake: Search SDL2_main separately for MSVC
2015-01-28 15:33:29 -06:00
20d6a7e675
cmake: exe icon on windows
2015-01-28 02:12:14 -06:00
2f1367aab6
cmake: Fixes to allow MSVC to compile
...
running is another story
2015-01-28 02:09:03 -06:00
495ea65cc5
Add GME and SDL2_mixer
...
Also support dynamic/static opengl switching
2015-01-28 01:20:43 -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
45e8ec34a6
always turn on LFS support when compiling for a Linux/GNU system with libpng support
2015-01-10 17:35:36 -05:00
e28882a56d
oh, nPlaneVerts is a size_t?, well, then we need to use sizeu#()
2015-01-10 17:27:24 -05:00
f5cd1d5ebc
add check on write failed in old TGA screenshot code
2015-01-10 17:26:29 -05:00
0c106a4ccc
I await the rise of AltimitOS because seriously, fuck this nonsense
2015-01-09 23:56:00 -05:00
8bee6bef59
Make sure clear_conditionsets feeds in 1 to MAXCONDITIONSETS instead of 0 to MAXCONDITIONSETS-1, so that M_ClearConditionSet can use them all properly AND clear all condition sets properly.
...
Apparently the mistake also caused myargc to be cleared in Linux64 SDL2 (as pointed out by that ilag11111 guy on GitHub), so that should be fixed now too.
2015-01-09 23:55:56 -05:00
7535bb261f
Account for the separation of F11 and F12 in the keycodes list
2015-01-09 23:55:52 -05:00
2b2b23efab
Merge branch 'next'
2015-01-01 14:51:38 -05:00
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
d959d0e462
Merge remote-tracking branch 'wolfy852/patch-2' into next
2014-11-29 13:08:32 -05:00
35547282ca
Merge branch 'master' into next
2014-11-29 13:08:12 -05:00
b153073585
Merge remote-tracking branch 'Sryder13/master'
2014-11-29 13:07:59 -05:00
3f1bb6359f
Merge remote-tracking branch 'upstream/master'
2014-11-14 22:21:07 +00:00
e90286ae52
Fix the polyobject crash
2014-11-14 22:19:44 +00:00
c9753836d2
Merge remote-tracking branch 'Furyhunter/master'
2014-11-14 01:05:47 -05:00
3fd2a705ee
Maybe this is the last warning related commit?
2014-11-14 00:04:54 -06:00
Ronald Kinard