zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,021 Commits 86 Branches 139 Tags 124 MiB
Commit Graph

97 Commits

Author SHA1 Message Date
Christoph Oelckers 3a3d538a45 Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-01 18:22:00 +02: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
Christoph Oelckers 4b8b5e37d8 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-27 08:22:18 +02:00
Christopher Bruns a7044c9a8b Remove quotation marks that cause trouble with older versions of CMake. 2016-09-25 22:11:08 +02: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
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