Christoph Oelckers
7898e189df
- fixed problems in CMake project files:
...
* thingdef_function.cpp no longer exists
* the build rule for zcc-parse.c was not correct.
2015-04-28 09:40:57 +02:00
Randy Heit
775e33ede7
Merge branch 'master' into scripting
...
Conflicts:
src/actor.h
src/g_doom/a_archvile.cpp
src/g_shared/a_morph.cpp
src/p_enemy.h
src/p_local.h
src/p_mobj.cpp
src/sc_man_tokens.h
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_exp.h
src/thingdef/thingdef_expression.cpp
src/thingdef/thingdef_states.cpp
wadsrc/static/actors/actor.txt
2015-01-29 20:53:08 -06:00
alexey.lysiuk
aa1f51d3d2
Reimplemented gaming controllers support in native OS X backend using pure IOKit
2015-01-04 14:08:53 +02:00
alexey.lysiuk
a67dc4148b
Split implementation of native OS X backend into several files
2014-12-28 16:35:00 +02:00
Randy Heit
b5e4153c78
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/b_think.cpp
src/g_doom/a_doomweaps.cpp
src/g_hexen/a_clericstaff.cpp
src/g_hexen/a_fighterplayer.cpp
src/namedef.h
src/p_enemy.cpp
src/p_local.h
src/p_mobj.cpp
src/p_teleport.cpp
src/sc_man_tokens.h
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_function.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/actor.txt
wadsrc/static/actors/constants.txt
wadsrc/static/actors/shared/inventory.txt
- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
were added to thingdef_function.cpp over the past year, as this file no
longer exists in this branch.
2014-12-21 21:15:11 -06:00
Randy Heit
2d87eb0ba2
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/actor.h
src/g_heretic/a_hereticmisc.cpp
src/g_heretic/a_hereticweaps.cpp
src/g_heretic/a_ironlich.cpp
src/info.h
src/namedef.h
src/p_buildmap.cpp
src/p_enemy.cpp
src/p_map.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
zdoom.vcproj
2014-12-20 19:13:14 -06:00
alexey.lysiuk
1433bf3f78
Put all non-Windows source code into posix directory and its subdirectories
2014-12-18 11:52:29 +02:00
alexey.lysiuk
84b12d23b5
Native OS X backend no longer requires SDL
2014-12-16 23:20:54 +02:00
alexey.lysiuk
3c76e5689a
Fixed path to SDL specific Obj-C++ file
2014-12-16 23:20:14 +02:00
alexey.lysiuk
83c8f44cc4
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_pure
2014-12-16 10:25:34 +02:00
alexey.lysiuk
8bc890c995
Rearranged files to avoid usage of symbolic links
2014-12-15 17:40:30 +02:00
alexey.lysiuk
9d135a0586
Get rid of SDL in more parts of native OS X backend
2014-12-14 16:28:31 +02:00
alexey.lysiuk
8d16c2e3c0
OS X native backend no longer use files from src/sdl directly
...
Cocoa backend is compiling but failed to link
Some files are referenced using symbolic links
Apple's HID Utilities were moved to own directory
2014-12-14 11:57:08 +02:00
Braden Obrzut
86372fce34
- Added Steam detection for Stife: Veteran Edition.
...
- Added Steam install scanning for Linux and OS X. (OS X and Win32 not yet tested.)
2014-12-12 16:23:46 -05:00
Braden Obrzut
da8f2185d8
- Adapt SDL2 changes for the Mac (both using SDL2 backend and Cocoa).
2014-12-11 16:54:38 -05:00
Edoardo Prezioso
372f7e7002
- Various CMake fixes for two problems.
...
1) Don't show OSX_COCOA_BACKEND option if the host is not OSX;
2) Don't use the '-msse' compiler flag in dumb/ if the architecture does not support it.
2014-12-10 21:11:26 +01:00
Braden Obrzut
a7b33a8ce3
- Removed XCursor code since SDL2 has proper color cursor support.
...
- Improved international keyboard support by falling back to scan codes if we don't recognize a keycode.
- Clear out any residual mouse movement when entering relative mouse mode.
2014-12-10 01:53:22 -05:00
Braden Obrzut
d625caf03c
- Ported SDL backend to SDL 2.0. Still needs a little bit of polish, but it works.
2014-12-08 18:46:10 -05:00
Christoph Oelckers
4a3427fe50
Merge branch 'opl3emu' of https://github.com/khokh2001/zdoom
2014-11-25 16:32:52 +01:00
khokh2001
e9075334a3
new opl3 emulator
2014-11-23 00:36:22 +09:00
alexey.lysiuk
3e1bb9017b
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-22 12:09:50 +02:00
Braden Obrzut
601852d224
- Fixed: fixrtext isn't needed with Win64 builds.
2014-11-17 21:56:16 -05:00
alexey.lysiuk
64e34d883b
Fixed build on UNIX systems other than OS X
2014-11-17 14:54:46 +02:00
alexey.lysiuk
b63bd56da8
Removed .xib file and, therefore, dependency from ibtool
...
Menu is now created in code
2014-11-15 13:32:37 +02:00
alexey.lysiuk
d2d6d2a7f8
Lowered minimum OS requirement to 10.5 Leopard
2014-11-08 13:30:41 +02:00
alexey.lysiuk
949325df68
Merge branch 'fix_cmake_unix' into z_osx_clean
2014-10-18 12:36:09 +03:00
alexey.lysiuk
1715b25a3e
Fixed Unknown CMake command "CHECK_LIBRARY_EXISTS" error on Unix targets
...
Previously it worked somehow but not with CMake 3.0.2
2014-10-18 12:33:39 +03:00
alexey.lysiuk
49dca4d9cb
Native Cocoa back-end is enabled by default
2014-09-20 11:56:15 +03:00
alexey.lysiuk
9479a89b66
Fixed crash on Release targets
2014-08-16 13:55:05 +03:00
alexey.lysiuk
96a3e0f729
Set more descriptive name for SDL source files list in CMake file
2014-08-10 12:30:19 +03:00
alexey.lysiuk
82e8c514e9
Renamed SDL specific source file with GUI related code
2014-08-09 13:20:52 +03:00
Braden Obrzut
177112603d
Added support for Cocoa back-end in CMake build system
2014-08-03 12:38:56 +03:00
alexey.lysiuk
fecd1b6401
Moved cursor and timer implementations into separate files
2014-08-03 12:33:29 +03:00
Randy Heit
bbc3b69a7c
Remove polymost stuff
...
- Maybe it will be back someday, but it's been essentially dead for nearly
10 years, so don't hold your breath.
2014-07-31 19:44:41 -05: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
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
Christoph Oelckers
9d846395bc
- replaced console buffer with a significantly more efficient new version that also can hold a lot more data.
2014-05-24 21:05:00 +02:00
Braden Obrzut
efa9e0c3ee
Merge branch 'maint'
2014-01-18 18:10:48 -05:00
Braden Obrzut
6f7885210b
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2014-01-18 14:58:39 -05:00
Christoph Oelckers
6824e8c931
Merge branch 'maint'
2014-01-18 01:12:06 +01:00
Christoph Oelckers
1fd1ac9bab
Merge branch 'cmake_uninitialized_fix' of https://github.com/edward-san/zdoom into maint
2014-01-18 01:10:33 +01:00
Edoardo Prezioso
b329a34a58
- Fixed some cmake --warn-uninitialized messages
2014-01-17 23:36:59 +01:00
Christoph Oelckers
e126c3ec2f
Merge branch 'maint'
2014-01-17 20:45:20 +01:00
Edoardo Prezioso
aafea851f0
- Remove clang check from GCC-related workaround
...
It caused a clang warning/error regarding the non-existing flags '-fno-tree-dominator-opts' and '-fno-tree-fre'.
2014-01-17 19:11:29 +01:00
Braden Obrzut
d8ff4ec281
- Fixed: All clang 5.0 warnings.
...
- Renamed autostart/autozend since Xcode’s build process links in strictly alphabetical order.
2014-01-05 19:50:09 -05:00
Christoph Oelckers
74dee4cd63
- removed ddraw.lib from CMake files because that library is not used anymore.
2013-12-09 11:24:58 +01:00
Braden Obrzut
c04a800e2b
- When doing OLDSTYLE builds we can use the RUNTIME_OUTPUT_DIRECTORY_<CONFIG> properties to force the output location properly.
2013-11-29 17:10:29 -05: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
Braden Obrzut
a8090dc22c
- Remove a hardcoded "zdoom" so that the name passed into the copy operation should always match that passed to /MAP.
2013-11-29 02:09:27 -05:00
Braden Obrzut
c21beb0b6c
- Fixed: Some versions of Visual Studio put the map file in a different location.
2013-11-29 01:54:46 -05:00