Commit Graph

534 Commits

Author SHA1 Message Date
Alam Ed Arias b5af756c22 appveyor: let stop build the whole mess 2016-01-29 00:53:34 -05:00
Alam Ed Arias e8cf4cdaac SDL2: compile SDL with SDL_main for Win32 2016-01-29 00:33:11 -05:00
Alam Ed Arias c47ff7b3c6 let make the main() entry point noreturns 2016-01-28 21:37:41 -05:00
Alam Ed Arias 050ce857c4 let not care for main() being noreturn 2016-01-28 21:31:18 -05:00
Alam Ed Arias 0d327c7c16 kill logical-not-parentheses warning in g_game.c
g_game.c: In function 'G_CheckDemoStatus':
g_game.c:5588:22: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
   if (!modeattacking == ATTACKING_RECORD)
                      ^
2016-01-28 21:15:51 -05:00
Alam Ed Arias 67b6d618a4 appveyor: build with/without the mixer and with/without OpenGL 2016-01-28 12:15:42 -05:00
Alam Ed Arias 4d0e1a8a1c appveyor: do not echo the full command 2016-01-28 12:12:04 -05:00
Alam Ed Arias 10e1aaaf85 appveyor: no need for DEPFLAGS 2016-01-28 12:08:08 -05:00
Alam Ed Arias 7fdb5cfcfb move disabled warning out of mingw 2016-01-28 12:06:00 -05:00
Alam Ed Arias 3c35ed60d3 appveyor: fixup cache list 2016-01-28 12:03:56 -05:00
Alam Ed Arias d762c4023e appveyor: show us all the commands 2016-01-28 11:52:33 -05:00
Alam Ed Arias 2176b21e62 ignore noreturns 2016-01-28 11:49:23 -05:00
Alam Ed Arias 7a09a82489 new flags: DEPFLAGS, to tell the depend step where are the headers 2016-01-28 11:41:02 -05:00
Alam Ed Arias 4230225a0c appveor: SDL, not SSDL 2016-01-28 11:36:51 -05:00
Alam Ed Arias 50846880a6 appveyor: not = for envs 2016-01-28 11:34:19 -05:00
Alam Ed Arias f0842d2200 appveyor: add debug and sdl mixer 2016-01-28 11:33:36 -05:00
Alam Ed Arias 89786ff7fd appveyor: include the SDL header in depend step: 2016-01-28 11:22:46 -05:00
Alam Ed Arias 5ace352e71 appveyor: manually set SDL flags 2016-01-28 11:16:24 -05:00
Alam Ed Arias e0f3733819 appveyor: hehe, OR 2016-01-28 11:05:09 -05:00
Alam Ed Arias 53aa932207 appveyor: ingore robocopy errorcode 2016-01-28 11:03:08 -05:00
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