Skip to content
Snippets Groups Projects
  1. Jan 16, 2016
  2. Jan 14, 2016
  3. Jan 13, 2016
    • Inuyasha's avatar
      Merge branch 'inu-misc' into 'master' · 08cb91d5
      Inuyasha authored
      Yeah, whatever, this is changing stuff that was already all my own
      anyway, and I already extensively tested it in the *first* place
      when I was measuring the amount of time it took.
      
      Honestly this could be merged into public master, but pfft...
      
      See merge request !19
      08cb91d5
  4. Jan 12, 2016
    • Monster Iestyn's avatar
      Fixed implicit declaration of some functions if compiling without OpenGL support · 22cf800f
      Monster Iestyn authored
      Not related to Wolfy's problems afaik... this branch seems to be turning into a misc compiling fixes branch now
      22cf800f
    • Monster Iestyn's avatar
      Removed void typedef for GLPatch_t used when HWRENDER is undefined · de576c56
      Monster Iestyn authored
      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
      de576c56
    • Monster Iestyn's avatar
      Fixed what appears to be a minor including error in sdl/i_system.c · 997ae7dc
      Monster Iestyn authored
      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.
      997ae7dc
    • Monster Iestyn's avatar
      Merge branch 'some-small-compiling-fix' into 'master' · 554c6289
      Monster Iestyn authored
      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
      554c6289
  5. Jan 11, 2016
Loading