alexey.lysiuk
2200569793
Fixed build on OS X without FMODEx
2015-06-07 11:31:53 +03:00
Christoph Oelckers
84351419a3
Merge branch 'master' of https://github.com/crimsondusk/zdoom
...
Conflicts:
src/actor.h
2015-04-30 10:03:50 +02:00
Christoph Oelckers
d880783784
- make OpenAL and the decoder libraries delay loaded so that ZDoom can still start without them being present.
...
This required the addition of a few exception handlers so to avoid #ifdef overuse I also added some #defines for non-Windows systems that allow using __try and __except directly in the code without #ifdef'ing them out.
2015-04-25 12:25:10 +02:00
Christoph Oelckers
0da6939e84
- unmark OpenAL as 'advanced' in CMake so we can set its include and library paths in the IDE without having to enable the advanced display which isn't really helpful.
2015-04-24 22:30:28 +02:00
Christoph Oelckers
1f2a431d15
Merge branch 'master' into openal
2015-04-24 09:21:06 +02:00
Christoph Oelckers
6326cd74b4
- moved tag iterators to their own file.
2015-04-19 09:07:05 +02:00
arezey
810a1dc28d
Fixed the way mt.exe is invoked
2015-04-12 02:44:12 +03:00
arezey
a6287a4706
Fix compilation with CMake on Windows when some other building tool than
...
msbuild is used.
2015-04-12 02:11:51 +03:00
Christoph Oelckers
ccd9fb9c23
- moved FDoomEdMap to its own file to make the upcoming changes a bit nicer to handle.
2015-04-03 10:54:55 +02:00
Randy Heit
d37f9cbcae
Add flies (doomed #112 ) from the Hexen retail beta
...
...because it brought back memories of adding Strife support.
- The search function is radically different, but the flying mechanics are
the same.
2015-04-02 17:52:54 -05: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
Randy Heit
719dfbe5a9
Don't die on configuration if xinput.h is not found
2015-02-27 21:51:04 -06:00
Chris Robinson
a8348b13de
Merge remote-tracking branch 'zdoom/master' into openal
...
Conflicts:
output_sdl/CMakeLists.txt
src/namedef.h
2015-01-15 13:08:05 -08: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
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
Chris Robinson
ff6eb6df5c
Merge remote-tracking branch 'zdoom/master' into openal
...
Conflicts:
src/s_sound.cpp
2014-09-09 14:45:53 -07: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
Chris Robinson
e8233d7e87
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-16 08:31:12 -07: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
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
eeae36fbf7
Rename the decoder sources
2014-06-19 17:53:37 -07:00