Commit Graph

50 Commits

Author SHA1 Message Date
mazmazz 3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz 4cfacf5cde Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Steel Titanium d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium 5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium 4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
Steel Titanium 6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Steel Titanium 02c08a3e10 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium f02105732e Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium 4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
Monster Iestyn a733a29f4c Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
Steel Titanium 79f5f4885c Split zlib and libpng 2018-10-04 19:47:19 -04:00
Alam Ed Arias 1ee7eda0ad Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00
Monster Iestyn c330907dba Added a SDL12=1 flag to all ports whose interface code still lives in the sdl12 folder (and is unsupported by SDL 2.0 officially anyway)
This basically causes the makefile to use the sdl12 folder instead of the main sdl folder
2017-09-14 21:03:20 +01:00
Alam Ed Arias 86a76a9766 Makefile: disable GETTEXT by default 2017-05-26 18:10:53 -04:00
Logan-A eb8f608fd7 Merge branch 'master' into netcode-shit 2017-01-02 15:18:28 -05:00
Louis-Antoine b347b818e7 -Fixed broken net commands, thus fixing (or at least greatly improving) chat/commands/joins/leaves and possibly other annoying bugs
-Updated packet name list so the debug file no longer shows garbage packet names
-Replaced byte values with actual net command names in the debug file. Only the first net command in a packet will be shown though
-Added a MOBJCONSISTANCY define that makes the game takes all revelant mobjs to be counted in the synch seed
-Added a PACKETDROP define that adds two console commands "drop" and "droprate" to simulate bad internet by dropping packets
-Added/changed comments here in there in the netcode
-Fixed a minor error that would ignore one of the urgent ack slots
-Added a space between the map name and "zone" for the messages shown in a joiner's console
2017-01-01 23:07:34 +01:00
Alam Ed Arias b9b5d20300 Makefile: move ZLIB flags outside of GME check 2016-11-13 17:34:53 -05:00
Alam Ed Arias c9aebc6f81 libz pkgconfig 2016-09-09 17:41:30 -04:00
Alam Ed Arias 5c234a817a Merge branch 'master' into next 2016-07-21 18:49:33 -04:00
Alam Ed Arias 9301344003 Merge branch 'macosx-hacking' into 'master'
OS X Makefile build setup

This merge request:

* Cleans up the OS X bundle resource location code and fixes a SIGSEGV and memory leak
* Simplifies and fixes the OS X desktop alert code, closing more leaks
* Adds the MACOSX build flag to the Makefiles, to allow building a binary (but not Mac app yet) of SRB2.

This is intended to make it easier for developers to build on Mac OS X, without having to pull in all of XCode. You can keep using CMake if you prefer.

To test, use `make -C src MACOSX=1 NONX86=1 SDL=1 NOASM=1` for a release build.

Left to do:

* Add a content bundling script to be run after building, and a flag to trigger doing that.
  `MACOSX_BUNDLE` maybe?
* Somehow get access to a Mac running PowerPC and figure out how to build a multi-platform binary.
* Add the proper magic to compile using gcc if requested. (Right now, compilation is done via LLVM/Clang)

See merge request !72
2016-07-21 15:38:46 -04:00
Monster Iestyn 69f556d40a Split AA trees code from m_misc.c/.h into m_aatree.c/.h
Also updated any relevant project files that I can think of to include the new files, as well as the makefile of course. Some of the other project files haven't been touched in years so I'll leave those alone ...unless someone objects
2016-06-05 21:29:40 +01:00
Alam Ed Arias 390927cc32 Makefile: compile debug build with -Og on GCC 4.8 and higher 2016-05-27 14:14:04 -04:00
Alam Ed Arias 0079b4df64 Make: compile Release build will all the speed 2016-05-26 20:39:15 -04:00
Alam Ed Arias 9550f9626b r_opengl.dll: UPX and static link libgcc 2016-05-20 17:36:46 -04:00
yoshibot 8fbc0d7f69 remove bogus homebrew gzip; objdump allowed to fail in that way 2016-05-18 23:52:06 -05:00
yoshibot df89563882 Add a way to build OS X binaries (not .app) through Makefiles 2016-05-18 19:14:53 -05:00
Alam Ed Arias a529dca69f SDL: in the SDL 2.0 interface code, we use a fake surface as our vidsurface, so we should be freeing it 2016-05-10 18:20:14 -04:00
wolfy852 f3f2c59622 Remove p_fab.c 2016-03-31 20:42:01 -05:00
Alam Ed Arias 6301deb2a5 Merge branch 'master' into next 2016-03-14 13:25:37 -04:00
Alam Ed Arias f5b56f2a07 fixup 2016-03-14 12:28:22 -04:00
Alam Ed Arias f9949a3026 dropping NOVERSION, you will not build SRB2 without a SCM 2016-03-14 12:24:51 -04:00
Alam Ed Arias 10e1aaaf85 appveyor: no need for DEPFLAGS 2016-01-28 12:08:08 -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 f0842d2200 appveyor: add debug and sdl mixer 2016-01-28 11:33:36 -05:00
RedEnchilada a5d7356fd2 Sayonara, m_vector.c 2015-05-23 01:32:28 -05:00
RedEnchilada 923fae476e Merge branch 'fury-gh/slopes' into angles
Conflicts:
	src/p_maputl.c
2015-04-19 15:56:55 -05:00
Alam Ed Arias 7cf1a1aab8 fixup cmake merge 2015-02-02 14:58:51 -05:00
Ronald Kinard 05f5ec664a Initial CMake support pass
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00
Alam Ed Arias 45e8ec34a6 always turn on LFS support when compiling for a Linux/GNU system with libpng support 2015-01-10 17:35:36 -05:00
Ronald Kinard 54f0d0c110 IN PROGRESS: porting eternity slopes from srb2cb 2014-11-18 18:45:57 -06:00
Ronald Kinard a0f959e597 Fix Makefile to target sdl correctly 2014-08-04 00:04:03 -05:00
Alam Ed Arias c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
Alam Ed Arias 0386516946 Merge remote-tracking branch 'Furyhunter/sdl2' 2014-08-03 21:02:24 -04:00
Alam Ed Arias cd97685e5a fix build for sh sheel 2014-08-02 11:10:00 -04:00
Alam Ed Arias d8eceeb0ac add build is done message into Makefile 2014-07-29 14:14:59 -04:00
Ronald Kinard 03fe3bdad2 Replace sdl with sdl2
SDL1.2 is dead, long live SDL
2014-07-26 02:06:00 -05:00
Alam Ed Arias f03e591f64 change SDL into HAVE_SDL 2014-07-25 19:10:24 -04:00
Ronald Kinard 2a827a98bb Initial SDL2 renderer impmlementation work. 2014-03-19 02:31:50 -05:00
Alam Ed Arias b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00