zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity
18864 commits 6 branches 6 tags 107 MiB
Commit graph

161 commits

Author SHA1 Message Date
Rachael Alexanderson
b7f6126bcd - First commit of archive split - preserve original assets 
- Added: d_main.cpp now searches for "gzdoom_optional_assets.pk3" - this can be changed in version.h for fork authors.
- Updated forum links to point to ZDoom.org.
 2017-09-07 04:08:09 -04:00
alexey.lysiuk
2f3cd7775a Added list of Windows XP compatible toolsets to CMake 
When generating projects for Visual Studio 2017 with v141_xp toolset CMake no longer warns about incompatibility with Windows XP
 2017-08-23 18:02:44 +03:00
alexey.lysiuk
680d1b2dd6 Moved all CMake modules and launcher templates to designated directory 
Let's not pollute root directory with various files
 2017-04-23 14:49:36 +03:00
Christoph Oelckers
f0d741241d - cleaned out most of the cruft from the docs directory and added a copy of the GPL v3. 2017-04-17 10:24:24 +02:00
Christoph Oelckers
c219811a54 - removed FMod as the last remaining piece of code that is not GPL compatible. 
Please consider GZDoom as licensed under the GPL starting with this commit, even though the license headers have not been changed yet.
 2017-04-17 01:06:54 +02:00
Christoph Oelckers
4cd0d3d454 - removed the Vector class in the GL renderer and replaced all its uses with FVector3. 
- optimized the math to get a plane equation from a linedef. The original code used a generic algorithm that knew nothing about the fact that Doom walls are always perfectly vertical. With this knowledge the plane calculation can be reduced to a lot less code because retrieving the normal is trivial in this special case.
- use the SSE2 rsqrtss instruction to calculate a wall's length, because this is by far the most frequent use of square roots in the GL renderer. So far this is only active on x64, it may be activated on 32 bit later as well, but only after it has been decided if 32 bit builds should be x87 or SSE2.

# Conflicts:
#	src/gl/dynlights/gl_dynlight.cpp

# Conflicts:
#	src/g_shared/a_dynlightdata.cpp
 2017-03-12 19:59:45 +01:00
Christoph Oelckers
ef3421eee5 - moved dynamic lights out of the GL code into the common game code. 
Since the true color software renderer also handles them there is no point keeping them on the GL side.
This also optimized how they are stored, because we no longer need to be aware of a base engine which doesn't have them.
 2017-03-12 19:57:06 +01:00
Rachael Alexanderson
536e8fad19 - Make QZDoom GZDoom again! 2017-03-09 11:51:42 -05:00
Magnus Norddahl
735157aea4 Bump minimum architecture to SSE 2 on the x86 platform (a Pentium 4 from 2001!) 2017-02-25 01:22:54 +01:00
Rachael Alexanderson
9ed45c7e03 Merge branch 'master' of http://github.com/rheit/zdoom 2016-10-26 22:06:25 -04:00
Jason A. Yundt
4c420938c9 - Added install rules so that 'make install' works. 2016-10-26 20:57:42 -04:00
raa-eruanna
172f521002 Merge http://github.com/rheit/zdoom 2016-09-29 05:37:07 -04:00
Christopher Bruns
3ecd20c4a1 Enhance IDE list of PK3 source files using a more complicated approach than I had hoped for. 2016-09-29 00:43:23 +02:00
Christopher Bruns
a83d1facdf Use GLOB_RECURSE and exclude file names with brackets, for a more complete list of PK3 source files for the IDE. 
# Conflicts:
#	CMakeLists.txt
 2016-09-29 00:43:22 +02:00
raa-eruanna
1b3f652abb Merge http://github.com/rheit/zdoom 2016-09-25 19:43:54 -04:00
Christopher Bruns
a7044c9a8b Remove quotation marks that cause trouble with older versions of CMake. 2016-09-25 22:11:08 +02:00
raa-eruanna
9ecb7d44f7 Merge http://github.com/coelckers/gzdoom 2016-09-24 23:36:47 -04:00
Christoph Oelckers
6b02ea9871 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	CMakeLists.txt
 2016-09-24 09:28:09 +02:00
Christopher Bruns
e9f31e5f95 Fix tabbing of recent change to CMakeLists.txt to match previous version. 2016-09-24 09:17:18 +02:00
Christopher Bruns
19c3529d32 Add a comment describing my enhancement to the CMake PK3 target rule. 2016-09-24 09:17:17 +02:00
Christopher Bruns
fa52c9d098 Add first level folder contents to SOURCES for PK3 targets, so I can open the files from Visual Studio. 
(cherry picked from commit c378cd4ff0b901051671932a39e3cb56e82541f4)

# Conflicts:
#	CMakeLists.txt
 2016-09-24 09:17:17 +02:00
Christoph Oelckers
d128e28044 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-14 21:05:45 +02:00
raa-eruanna
81545d9b4e Merge http://github.com/rheit/zdoom 
# Conflicts:
#	src/v_video.cpp
 2016-09-14 02:24:59 -04:00
raa-eruanna
b85e3b56e3 Establish QZDoom 2016-09-14 02:21:35 -04:00
Braden Obrzut
fd53aefbf2 Added warning if building on Visual Studio 2015 without v140_xp. 2016-09-13 20:55:31 -04:00
Christoph Oelckers
f4e4221da7 Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-05 21:51:54 +02:00
Jason Yundt
fbf845982b FORCE_INTERNAL_GME now defaults to OFF 2016-05-05 21:04:48 +02:00
Christoph Oelckers
48afdd7dcb Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/CMakeLists.txt
#	src/actor.h
 2016-03-21 01:34:39 +01:00
Christoph Oelckers
c64eee5b15 Merge branch 'master' into float 
# Conflicts:
#	src/g_heretic/a_hereticweaps.cpp
#	src/p_map.cpp
#	src/p_mobj.cpp
#	src/p_things.cpp
#	src/portal.cpp
 2016-03-15 00:16:13 +01:00
Christoph Oelckers
f4f489b33d Merge branch 'master' of https://github.com/rheit/zdoom 2016-03-14 22:02:58 +01:00
Braden Obrzut
93be5aca05 - Fixed: Modern versions of GCC on PowerPC inserted padding to the end of pragma packed structures. 
- Worked aorund modern GCC bug where C++ exceptions in Objective-C++ code would result in an ICE (bug is already on their tracker, but I doubt it will be fixed unless I decide to dig into the issue myself).
- Turn off fused floating point instructions since these can cause slight deviations in floating point code.
- Use -static-libgcc when compiling on the Mac with GCC since we need to use a custom version of GCC to do so now.
- Note: ZDoom will currently still crash on exit on PowerPC since it seems to be deciding that NameManager needs to be destructed before the console commands.
 2016-03-13 01:14:08 -05:00
Christoph Oelckers
161d03231a - added custom math routines for reliability. 2016-03-11 15:45:47 +01:00
Christoph Oelckers
e9e30a6431 Merge branch 'master' of https://github.com/rheit/zdoom 2016-03-04 14:10:28 +01:00
Christoph Oelckers
93323b64f8 - explicitly force SSE2 for Visual Studio 64 bit projects so that the advanced instruction sets don't get activated by accident. 2016-03-04 10:16:23 +01:00
Christoph Oelckers
dfd7e08307 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/menudef.txt
 2016-02-21 01:55:15 +01:00
Edoardo Prezioso
85fbcf0428 - Improve CMake messages for zlib/jpeg/bzip2/gme. 
* Report the include location if they're external libraries;
* Remove unneeded include location messages from zipdir.
 2016-02-20 11:38:30 +01:00
Edoardo Prezioso
a7df6ad42d - Simplify CMake 'else() if(..)' to 'elseif(..)'. 2016-02-20 11:38:29 +01:00
galtgendo
71f66aa912 look for gme header in the proper location 
[EP] Cherry-picked from gzdoom fork.
 2016-02-20 11:38:29 +01:00
Christoph Oelckers
6e6ddfbc25 Merge remote-tracking branch 'remotes/zdoom/master' 2016-02-19 16:14:52 +01:00
Edoardo Prezioso
f338e5f1c4 - Apply the fast math flags for non-MSVC, too. 
Move the fast flags string creation in the main cmake file and use it where needed.
 2016-02-18 23:13:02 +01:00
Christoph Oelckers
71fc4c295f - removed global fastmath setting now that it is controlled by per-source-file settings. 2016-02-13 15:36:54 +01:00
Christoph Oelckers
760db90d71 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	CMakeLists.txt
 2016-02-06 05:21:48 +01:00
Braden Obrzut
dce3f0f757 - Bump CMake version requirement to 2.8.7. This means that generator expressions must be supported as well as empty else and endif expressions (like most sane languages). ZDoom probably didn't work with 2.4 anymore anyway. 2016-02-05 21:19:29 -05:00
Christoph Oelckers
beb7a8e4a2 - added /LARGEADDRESSAWARE linker flag to CMake project. 2015-12-22 22:21:59 +01:00
Christoph Oelckers
a59824cd88 - fixed: MD2 vertex indices were signed shorts but should be unsigned. 
- fixed a few warnings from Visual C++ 2015.
 2015-05-07 11:36:31 +02:00
Christoph Oelckers
3ddc3d8feb Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/CMakeLists.txt
 2015-04-27 09:41:06 +02:00
Christoph Oelckers
1f2a431d15 Merge branch 'master' into openal 2015-04-24 09:21:06 +02:00
Christoph Oelckers
6eb4e2a224 Merge branch 'master' of https://github.com/rheit/zdoom 2015-03-31 18:25:31 +02:00
Braden Obrzut
890fb39d25 - Apparently cmake_policy doesn't ignore unknown policies (which seems to defeat the purpose to me) so we must wrap them in code to detect if the policy is known. 2015-03-24 18:28:59 -04:00
Christoph Oelckers
c249157876 Merge branch 'master' into openal 2015-03-24 17:59:08 +01:00
Braden Obrzut
b958e930cf - Cleared developer warnings with modern (3.0+) versions of CMake. 2015-03-23 23:28:18 -04:00
Chris Robinson
e8233d7e87 Merge remote-tracking branch 'zdoom/master' into openal 2014-07-16 08:31:12 -07:00
Christoph Oelckers
4297bd9a51 Merge branch 'master' of https://github.com/rheit/zdoom 2014-07-14 00:32:16 +02:00
Edoardo Prezioso
d83f048858 - Miscellaneous CMakeLists.txt fixes. 
- fixed a CMake warning about uninitialized use of the variable CROSS_EXPORTS in the tools subfolder when CMAKE_CROSSCOMPILING is off;
- fixed a variable typo: CMAKE_CURRENTY_BINARY_DIR instead of CMAKE_CURRENT_BINARY_DIR;
- in src/CMakeLists.txt, fixed a missing merge of a portion of code from maint branch to master.
 2014-07-01 19:13:05 +02:00
Chris Robinson
48df515dd1 Merge remote-tracking branch 'zdoom/master' into openal 2014-06-28 23:29:48 -07:00
Christoph Oelckers
28afd04aef Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/CMakeLists.txt
 2014-06-27 01:10:09 +02:00
Edoardo Prezioso
1a3ac9d0b3 - Simplify CMake GCC and Clang checking. 
Introduce the variable 'ZD_CMAKE_COMPILER_IS_GNUC(XX)_COMPATIBLE' and replace any occurrence of '"${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "Clang"' with it. This makes it possible to add more GCC compatible compilers in just one place.
 2014-06-26 01:23:41 +02:00
Chris Robinson
7ff7c151a8 Merge remote-tracking branch 'origin/master' into openal 
Conflicts:
	src/CMakeLists.txt
 2014-06-15 12:04:15 -07:00
Chris Robinson
0e21057a2a Merge remote-tracking branch 'origin/openal' into openal 
Conflicts:
	src/sound/fmodsound.cpp
	src/sound/oalsound.cpp
	src/sound/oalsound.h
 2014-06-15 09:59:24 -07:00
galtgendo
bf0b850088 look for gme header in the proper location 2014-03-28 01:54:20 +01:00
Christoph Oelckers
7954263f5c Merge branch 'master' of https://github.com/rheit/zdoom 2014-01-18 01:19:36 +01:00
Christoph Oelckers
6824e8c931 Merge branch 'maint' 2014-01-18 01:12:06 +01:00
Edoardo Prezioso
b329a34a58 - Fixed some cmake --warn-uninitialized messages 2014-01-17 23:36:59 +01:00
Christoph Oelckers
005313c00e Merge branch 'master' of https://github.com/rheit/zdoom 2014-01-04 11:29:02 +01:00
Braden Obrzut
49edd7c60c - Add support for cross compiling so that OS X PowerPC builds can still be made on systems without rosetta (10.7+). (Compiling x86 binaries on ppc should also be possible.) 2014-01-02 01:59:04 -05:00
Christoph Oelckers
3fbcfa7551 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-30 01:34:10 +01:00
Braden Obrzut
974619d5be - According to Graf, we should just let zipdir determine if the pk3 needs updating. 2013-11-29 17:13:34 -05:00
Braden Obrzut
90e9482067 - Get as many files as possible as dependencies for pk3 building. (Kind of feels like CMake changes the behavior of depending on directories every now and then, but maybe it's just me.) 2013-11-29 14:41:03 -05:00
Christoph Oelckers
5624b1ace0 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-29 12:53:31 +01:00
Christoph Oelckers
b9c032461e - add a CMake option to enable/disable SSE2 with Visual C++. This is necessary because since VC 2012 SSE2 is the default instruction set. 2013-11-29 12:35:45 +01:00
Christoph Oelckers
bac9303fe4 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-29 10:09:12 +01:00
Braden Obrzut
c6c6487a30 - Fixed: Got a little hyper corrective in c763217. 2013-11-28 14:41:40 -05:00
Christoph Oelckers
45070114e8 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	.gitignore
	CMakeLists.txt
 2013-11-28 12:44:27 +01:00
Christoph Oelckers
7cb70f60b3 - removed duplicate #define warning in fmodsound.cpp. 
- commented out output of Cr0NpxState for floating point state because this variable was renamed in most recent Windows headers.
- added CMAKE option to generate assembly output for release builds.
- added my CMake-based project directory to .gitignore.
 2013-11-28 11:03:19 +01:00
Christoph Oelckers
40d4ebcbc5 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-26 22:12:18 +01:00
Braden Obrzut
c7632174d8 - Fixed error in manifest embedding that stopped the binary from working on Windows XP. 
- Tweaked PK3 copying commands so that it shouldn't be possible to end up with files named Debug/Release.
 2013-11-26 12:49:23 -05:00
Christoph Oelckers
0b1ccfb582 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-11 09:58:55 +01:00
Braden Obrzut
f0b946c3cf - Allow use of system GME library. It defaults to forcing the use of the internal library at least for now though. 2013-11-06 13:37:34 -05:00
Christoph Oelckers
b91d5d5eb5 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
 2013-11-03 16:55:00 +01:00
Braden Obrzut
97d7b1e59e Merge branch 'origin/maint' 
Conflicts:
	src/sound/fmodsound.cpp
 2013-10-23 19:39:22 -04:00
Braden Obrzut
0759a4b438 - Actually, lets not use /Gm since it's incompatible with /MP which will be much faster on multi-core machines. 
- Added ZDOOM_GENERATE_MAPFILE which enables linker map file generation.
 2013-10-12 01:44:57 -04:00
Braden Obrzut
03b75ae7c1 - Fixed a few flags for Visual Studio compilation. 2013-10-12 00:56:49 -04:00
Braden Obrzut
3e90b65014 - Use release compiler flags for debug builds of third party libraries. 2013-10-12 00:24:04 -04:00
Braden Obrzut
b9a1528747 - DYN_FLUIDSYNTH now defaults to ON. 
- Added ZDOOM_OUTPUT_OLDSTYLE (could probably use a more descriptive name) which causes CMake to vary the executable name by build type and place the exes and pk3s into the directory specified in ZDOOM_OUTPUT_DIR.
- ALL_BUILD will now launch ZDoom.
 2013-10-10 17:40:15 -07:00
Christoph Oelckers
cb74dd99ef - MSVC Release also needs the /Oi option for best performance. 2013-10-09 15:54:56 +02:00
Christoph Oelckers
41856905be - CMake: The GL renderer requires fast Floating point math or performance will go down the drain. 
- added CMake 'build' directory to .gitignore.
 2013-10-09 13:06:18 +02:00
Christoph Oelckers
cde0c465c6 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/CMakeLists.txt
 2013-10-09 11:32:58 +02:00
Braden Obrzut
4ced90756a - Let CMake know about noncompiled cpp files so they can appear in project files. 
- Fixed: Somehow when I added a way to disable generator expressions I inverted the meaning of NO_GENERATOR_EXPRESSIONS.
 2013-10-08 15:35:50 -04:00
Christoph Oelckers
503dc1d9a1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	wadsrc/CMakeLists.txt
 2013-07-02 09:59:59 +02:00
Braden Obrzut
02ff428d54 - Allow generator expressions to be turned off during pk3 building with CMake. 
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
 2013-07-01 16:57:46 -04:00
Chris Robinson
4f2e367ec6 Remove GStreamer support 2013-06-30 01:07:09 -07:00
Chris Robinson
18597a93a7 Merge remote-tracking branch 'origin' into openal 
Conflicts:
	src/sound/fmodsound.cpp
 2013-06-29 19:02:04 -07:00
Christoph Oelckers
054899ea53 - added Edward-san's patch for allowing 'clang' compiler to use the same 'gcc' cmake settings 2013-06-23 17:38:51 -05:00
Christoph Oelckers
faeba3933e Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 18:52:45 +02:00
Christoph Oelckers
7c81c2f1ee - added Edward-san's patch for allowing 'clang' compiler to use the same 'gcc' cmake settings 2013-06-23 18:37:13 +02:00
Christoph Oelckers
8c31955731 - brightmap and light definitions. 2013-06-23 09:32:35 +02:00
Braden Obrzut
01fed92920 - Added support for Visual Studio to the CMake project. 
SVN r4166 (trunk)
 2013-02-25 00:12:21 +00:00
Braden Obrzut
f6ddad95b7 - Set the CMAKE_MODULE_DIR so that we can use find_package instead of include for FluidSynth. 
- Fixed: FadeTo() accepted parameters out of range.
- Fixed: "Enable autosaves" menu option didn't handle all possible values of disableautosave.

SVN r3280 (trunk)
 2011-08-16 21:59:35 +00:00
Christoph Oelckers
5603c70574 [OpenAL branch] 
- apply Chris's latest patch.




SVN r2534 (openal)
 2010-08-13 07:07:26 +00:00
Braden Obrzut
99e0adaf45 - Fixed some issues with compiling on the Mac. Some options were added to force compilation of internal libraries and added checks for building ppc binaries on x86. 
SVN r2515 (trunk)
 2010-08-12 02:32:03 +00:00