Commit Graph

7 Commits

Author SHA1 Message Date
Inuyasha 8b7e0347fd Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
# Conflicts:
#	src/sdl/i_system.c
2016-02-25 15:41:13 -08:00
Alam Ed Arias 8a369d969b whitespace clean 2016-02-25 18:31:40 -05:00
Ronald Kinard 649dd7bd8d Fix SDL2 searching for main when it wasn't necessary. 2015-03-31 18:00:14 -04:00
Alam Ed Arias 515895dd30 cmake: Fixes to allow MSVC to compile
running is another story

Author:    Ronald Kinard <furyhunter600@gmail.com>
Date:      Wed Jan 28 02:09:03 2015 -0600

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9013 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
Ronald Kinard 57037e4124 cmake: fixes to enable linux compilation
string.c, capitalization, find fixes
2015-01-28 20:15:24 +00:00
Ronald Kinard 2f1367aab6 cmake: Fixes to allow MSVC to compile
running is another story
2015-01-28 02:09:03 -06:00
Ronald Kinard 05f5ec664a Initial CMake support pass
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00