Commit Graph

514 Commits

Author SHA1 Message Date
Alam Ed Arias ffe193ca3e appveyor: mistakes are easy to make 2016-01-28 10:55:38 -05:00
Alam Ed Arias 46f9e4a961 appveyor: we need to run 7zip twice 2016-01-28 10:52:40 -05:00
Alam Ed Arias 9e1ba2e972 appvenyor: self note only 2016-01-28 10:44:52 -05:00
Alam Ed Arias e5dbd3cb9d appveyor: copy and paste mistake on extracting archive comannd 2016-01-28 10:40:28 -05:00
Alam Ed Arias 9422b994e4 appveyor: fixup env block 2016-01-28 10:30:35 -05:00
Alam Ed Arias 5bf43171ae appveyor: let try SDL2 builds 2016-01-28 10:29:02 -05:00
Alam Ed Arias d0ce9170da appveyor: build for GCC 5.2 2016-01-27 01:39:12 -05:00
Alam Ed Arias 1a72f2f1db appveyor: wrong path... 2016-01-27 01:32:53 -05:00
Alam Ed Arias 443562c3c0 appveyor: why is this failing 2016-01-27 01:26:36 -05:00
Alam Ed Arias 6e1b9549fc appveyor: fullpath to binaries 2016-01-27 01:24:32 -05:00
Alam Ed Arias 85de668d1a appveyor: move set to before_build, and drop gcc and make version 2016-01-27 01:21:29 -05:00
Alam Ed Arias 113a3cd6fc appveyor: try again 2016-01-27 01:16:42 -05:00
Alam Ed Arias 8ad8533880 appveyor: found mingw64 32-bit target, do not build with UPX 2016-01-27 01:09:51 -05:00
Alam Ed Arias cbd85e6baf appveyor: spacing 2016-01-27 00:27:32 -05:00
Alam Ed Arias 289b5506bf appveyor: whitespace? 2016-01-27 00:15:09 -05:00
Alam Ed Arias 21c30a396c appveyor: allow one to RDP to system to debug build system 2016-01-27 00:11:54 -05:00
Alam Ed Arias b8cafea40a appveyor: full path to make binary and no asm or png support 2016-01-26 23:56:22 -05:00
Alam Ed Arias 3db1a1fe9f add/test appveyor build 2016-01-26 23:30:53 -05:00
Alam Ed Arias 181c875016 SDL: config.h.in is pre source tree, config.h for each cmake build 2016-01-22 17:25:19 -05:00
Sean Ryder 7d914913dd Tabbing 2016-01-20 15:55:32 +00:00
Sean Ryder 6a67609b74 Merge branch 'master' into md2_colourchange 2016-01-12 23:52:04 +00:00
Monster Iestyn 554c62891d Merge branch 'some-small-compiling-fix' into 'master'
Some small compiling fix

~~See commit description for details, I'm not repeating it all here with different words.~~

~~Needs testing before we actually merge the changes in, I don't have anything besides Windows so I can't actually try this fix out for myself sadly. :(~~

This was originally a quick branch I made to fix a problem so that @wolfy852  could compile with Linux on some thing of his ...turned out not to be the only problem, and then I found a slightly unrelated problem altogether. So it's now a small assortment of compiling-related fixes.

Also should be merged to next, which is hopefully obvious.

See merge request !29
2016-01-11 21:20:01 -05:00
Monster Iestyn a8e4234d74 Fixed implicit declaration of some functions if compiling without OpenGL support
Not related to Wolfy's problems afaik... this branch seems to be turning into a misc compiling fixes branch now
2016-01-11 14:51:55 +00:00
Monster Iestyn be266c27e1 Removed void typedef for GLPatch_t used when HWRENDER is undefined
Apparently all parts of the source code that require GLPatch_t are themselves used only if HWRENDER is defined. Do I need to say more?

Not sure if this will fix Wolfy's latest problem or not though
2016-01-10 20:56:09 +00:00
Monster Iestyn 146011937a Fixed what appears to be a minor including error in sdl/i_system.c
Basically, Wolfy's linux (non-CMake) compiling apparently fails here, and config.in.h actually lives outside of the sdl folder. Blame a particular someone for blindly copy+pasting these includes in this file without considering the consequences when adding support for CMake everywhere.
2016-01-10 18:24:58 +00:00
Monster Iestyn 775ccde424 Add M_Options(0); to F4/F5/F7 code to prevent them going to Main Menu instead of SP/MP pause menus when the latter should be shown 2015-09-01 22:56:45 -04:00
Sryder13 d050a60f36 Change a few colours. 2015-08-03 02:01:56 +01:00
Sryder13 cc3d3a67e6 Colour Changing MD2s
I don't know how I can move my old branch over so I've just created a new one.
2015-07-26 20:14:47 +01:00
Ronald Kinard d7b3795a82 Merge branch 'fix-windows-compile'
Closes STJr/SRB2!4.
2015-03-24 23:04:44 -05: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 and instead
adds the core sources to the SRB2SDL2 target directly.

So frustrating...
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 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
Ronald Kinard 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
Ronald Kinard 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
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
Alam Ed Arias 2609745b51 it was me, Duo! 2015-02-06 10:22:16 -05:00
Alam Ed Arias ed0d70feca do not typedef off_t when we do not need to 2015-02-05 17:32:27 -05:00
Alam Ed Arias 542295c863 remove comptime.h from cmake file list 2015-02-05 17:32:26 -05:00
Alam Ed Arias 01d441e6c0 Merge remote-tracking branch 'Furyhunter/ipv6-osx-fix' 2015-02-05 17:04:54 -05:00
Alam Ed Arias 8cccfa558a do not include anything in assets folder unless forced 2015-02-05 17:04:24 -05:00
Ronald Kinard 062a746fdd Further fix IPv4 when IPv6 is available 2015-02-05 15:36:07 -06:00
Ronald Kinard ae05613460 Fix IPv4 connectivity when IPv6 is enabled 2015-02-05 00:32:54 -06:00
Alam Ed Arias 3d498fe894 VERSIONSTRINGW is funny 2015-02-02 15:21:58 -05:00
Alam Ed Arias 7cf1a1aab8 fixup cmake merge 2015-02-02 14:58:51 -05:00
Alam Ed Arias 244fb0b2b5 Merge remote-tracking branch 'Furyhunter/cmake-update' 2015-02-02 12:52:51 -05: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 d7015d1492 cmake: Fix nasm/add yasm support
Tested to work on MSVC, mingw-gcc
2015-02-01 21:25:02 -06:00
Ronald Kinard 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