stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
12697 commits 172 branches 41 tags 280 MiB
Commit graph

18 commits

Author SHA1 Message Date
Eidolon
ce5c41d7eb Merge branch 'the-one-cmake' into 'next' 
Overhaul cmake build

See merge request STJr/SRB2!1832

(cherry picked from commit 4337205fa8)

# Conflicts:
#	src/sdl/CMakeLists.txt
 2022-11-05 03:09:38 -05:00
mazmazz
16ae83ba9c FindOPENMPT cmake 2019-01-04 19:22:48 -05:00
Steel Titanium
fbb2cde800 Make this be consistent with non-CMake builds 2018-12-03 15:42:37 -05:00
Alam Ed Arias
81fc9df8d3 Merge branch 'master' into next 2016-03-10 18:02:23 -05:00
Monster Iestyn
4ab2c336e7 Possibly fixed the issues with LibGME mentioned in issue #14. 
Not even the HAVE_LIBGME macro was defined apparently, huh.
 2016-03-06 19:32:07 +00:00
Alam Ed Arias
b3b5521e1b Merge branch 'master' into next 2016-02-25 18:33:29 -05:00
Alam Ed Arias
8a369d969b whitespace clean 2016-02-25 18:31:40 -05:00
Alam Ed Arias
83461f49c5 Merge branch 'public_todo_next' into next 
All commits that was in private that are not SRB2 2.2 had moved to public's next
 2015-04-01 12:32:34 -04: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
f28b050c07 Append current branch name to comp version string. 2015-03-04 20:15:57 -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
57037e4124 cmake: fixes to enable linux compilation 
string.c, capitalization, find fixes
 2015-01-28 20:15:24 +00:00
Ronald Kinard
0909fce2e3 cmake: Configure source via cmake 
silently fixing a bad malloc here too shhhhhhhhh
 2015-01-28 18:03:41 -06:00
Ronald Kinard
1c9de50ad2 cmake: Search SDL2_main separately for MSVC 2015-01-28 15:33:29 -06: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
495ea65cc5 Add GME and SDL2_mixer 
Also support dynamic/static opengl switching
 2015-01-28 01:20:43 -06:00
Ronald Kinard
05f5ec664a Initial CMake support pass 
Compiles the SDL2 target on Windows successfully
 2015-01-27 23:46:39 -06:00