zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 14:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze-gles/source/CMakeLists.txt

1329 lines
47 KiB
Text
Raw Normal View History

- use std::filesystem for directory traversal. So far implemented for scanning search paths
2019-10-29 18:53:46 +00:00
cmake_minimum_required( VERSION 3.1.0 )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
include(precompiled_headers)
if( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
include( CheckCXXSourceCompiles )
include( CheckFunctionExists )
include( CheckCXXCompilerFlag )
include( CheckIncludeFile )
include( CheckIncludeFiles )
include( CheckLibraryExists )
include( FindPkgConfig )
- fixed the setup. Renamed all elements still referring to zdoom. removed the frontend specific resource data. fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
2019-09-22 23:28:18 +00:00
if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
option( NO_STRIP "Do not strip Release or MinSizeRel builds" )
# At least some versions of Xcode fail if you strip with the linker
# instead of the separate strip utility.
if( APPLE )
set( NO_STRIP ON )
endif()
endif()
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
# Build does not work with signed chars!
- project rework to shorten compile times. * subprojects fpr game frontends added and unsigned char option put into global flags.
2019-10-16 21:09:02 +00:00
if (MSVC)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" )
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
else()
- more macOS compilation fixes Still not complete…
2020-01-07 00:11:19 +00:00
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funsigned-char -Wno-missing-braces -Wno-char-subscripts -Wno-unused-variable" )
- project rework to shorten compile times. * subprojects fpr game frontends added and unsigned char option put into global flags.
2019-10-16 21:09:02 +00:00
endif()
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
option( DYN_OPENAL "Dynamically load OpenAL" ON )
if( APPLE )
option( OSX_COCOA_BACKEND "Use native Cocoa backend instead of SDL" ON )
endif()
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
target_architecture(TARGET_ARCHITECTURE)
message(STATUS "Architecture is ${TARGET_ARCHITECTURE}")
- fixed auto-picking of game GRPS from the command line.
2019-11-19 20:35:35 +00:00
- hictinting cleanup. This needs to be moved into the backend, and partially into the shader. So far this only removes the code from the main rendering logic, the final implementation is not done yet. It had to go because it required the main rendering code to look deep into the texture data which would be a major blocker for refactoring.
2019-10-17 18:29:58 +00:00
# Right now only 64 bit is supported.
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
if( ${TARGET_ARCHITECTURE} MATCHES "x86_64" )
- fixed auto-picking of game GRPS from the command line.
2019-11-19 20:35:35 +00:00
set( X64 64 )
endif()
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
if( X64 OR ${TARGET_ARCHITECTURE} MATCHES "i386" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
add_definitions( -DARCH_IA32 )
endif()
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
if( NOT PROJECT_LIBRARIES )
set( PROJECT_LIBRARIES "" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
if( WIN32 )
if( X64 )
set( WIN_TYPE Win64 )
set( XBITS x64 )
else()
set( WIN_TYPE Win32 )
set( XBITS x86 )
endif()
add_definitions( -D_WIN32 )
- hictinting cleanup. This needs to be moved into the backend, and partially into the shader. So far this only removes the code from the main rendering logic, the final implementation is not done yet. It had to go because it required the main rendering code to look deep into the texture data which would be a major blocker for refactoring.
2019-10-17 18:29:58 +00:00
set( DX_dinput8_LIBRARY dinput8 )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
opengl32
wsock32
winmm
"${DX_dinput8_LIBRARY}"
ole32
user32
gdi32
comctl32
comdlg32
ws2_32
setupapi
oleaut32
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
dbghelp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
legacy_stdio_definitions
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
shlwapi
version
imm32
dxguid
dsound
winspool
advapi32
shell32
SetupAPI
uuid
odbc32
odbccp32
- be gone, MultiVoc.
2019-12-18 21:50:37 +00:00
# this local library crap needs to go away. Sadly there doesn't seem to be anything to get a working libvpx that doesn't force linking with MinGW dependencies.
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
libvpx
libcompat-to-msvc
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- fixed the setup. Renamed all elements still referring to zdoom. removed the frontend specific resource data. fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
2019-09-22 23:28:18 +00:00
if( NOT DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} DelayImp )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
- fixed the setup. Renamed all elements still referring to zdoom. removed the frontend specific resource data. fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
2019-09-22 23:28:18 +00:00
if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if( DX_dxguid_LIBRARY )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
list( APPEND PROJECT_LIBRARIES "${DX_dxguid_LIBRARY}" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
endif()
else()
if( APPLE )
set( NO_GTK ON )
set( DYN_GTK OFF )
# Prevent inclusion of fp.h and FixMath.h from Carbon framework
# Declarations from these files are not used but cause the following conflicts:
# - redefinition of 'FixedToFloat' and 'FloatToFixed' macros
# - redefinition of 'pi' as different kind of symbol
add_definitions( -D__FP__ -D__FIXMATH__ )
else()
option( NO_GTK "Disable GTK+ dialogs (Not applicable to Windows)" )
option( DYN_GTK "Load GTK+ at runtime instead of compile time" ON )
# Use GTK+ for the IWAD picker, if available.
if( NOT NO_GTK )
pkg_check_modules( GTK3 gtk+-3.0 )
if( GTK3_FOUND )
if( NOT DYN_GTK )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
include_directories( ${GTK3_INCLUDE_DIRS} )
link_directories( ${GTK3_LIBRARY_DIRS} )
else()
pkg_check_modules( GTK2 gtk+-2.0 )
if( GTK2_FOUND )
if( NOT DYN_GTK )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
include_directories( ${GTK2_INCLUDE_DIRS} )
link_directories( ${GTK2_LIBRARY_DIRS} )
else()
set( NO_GTK ON )
endif()
endif()
endif()
endif()
if( NO_GTK )
add_definitions( -DNO_GTK )
elseif( DYN_GTK )
add_definitions( -DDYN_GTK=1 )
else()
add_definitions( -DDYN_GTK=0 )
endif()
# Non-Windows version also needs SDL except native OS X backend
if( NOT APPLE OR NOT OSX_COCOA_BACKEND )
find_package( SDL2 REQUIRED )
include_directories( "${SDL2_INCLUDE_DIR}" )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
find_path( FPU_CONTROL_DIR fpu_control.h )
if( FPU_CONTROL_DIR )
include_directories( ${FPU_CONTROL_DIR} )
add_definitions( -DHAVE_FPU_CONTROL )
endif()
endif()
if( NOT NO_OPENAL )
if ( NOT DYN_OPENAL ) # DYN_OPENAL uses local copies of the headers.
find_package( OpenAL )
mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
if( OPENAL_INCLUDE_DIR )
include_directories( ${OPENAL_INCLUDE_DIR} )
mark_as_advanced(CLEAR OPENAL_LIBRARY)
if( OPENAL_LIBRARY )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} ${PROJECT_LIBRARIES} )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
else()
set( NO_OPENAL ON )
endif()
else()
set( NO_OPENAL ON )
endif()
else()
add_definitions( -DDYN_OPENAL )
endif()
endif()
if( NO_OPENAL )
add_definitions( -DNO_OPENAL=1 )
endif()
# Decide on SSE setup
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
# SSE only matters on 32-bit targets. We check compiler flags to know if we can do it.
if( CMAKE_SIZEOF_VOID_P MATCHES "4" AND NOT CMAKE_OSX_ARCHITECTURES MATCHES ppc )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
CHECK_CXX_COMPILER_FLAG( "-msse2 -mfpmath=sse" CAN_DO_MFPMATH )
CHECK_CXX_COMPILER_FLAG( -arch:SSE2 CAN_DO_ARCHSSE2 )
if( CAN_DO_MFPMATH )
set( SSE1_ENABLE "-msse -mfpmath=sse" )
set( SSE2_ENABLE "-msse2 -mfpmath=sse" )
elseif( CAN_DO_ARCHSSE2 )
set( SSE1_ENABLE -arch:SSE )
set( SSE2_ENABLE -arch:SSE2 )
endif()
endif()
if( X64 )
set( HAVE_MMX 1 )
else( X64 )
set( SAFE_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
- fixed the setup. Renamed all elements still referring to zdoom. removed the frontend specific resource data. fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
2019-09-22 23:28:18 +00:00
if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmmx")
- fixed the setup. Renamed all elements still referring to zdoom. removed the frontend specific resource data. fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
2019-09-22 23:28:18 +00:00
endif( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
CHECK_CXX_SOURCE_COMPILES("#include <mmintrin.h>
int main(void) { __m64 v = _m_from_int(0); }"
HAVE_MMX)
set( CMAKE_CXX_FLAGS ${SAFE_CMAKE_CXX_FLAGS} )
endif( X64 )
CHECK_CXX_SOURCE_COMPILES("#include <ppl.h>
int main() { concurrency::parallel_for(0, 1, 1, [](int) { } ); }"
HAVE_PARALLEL_FOR)
if( NOT HAVE_PARALLEL_FOR )
CHECK_CXX_SOURCE_COMPILES("#include <dispatch/dispatch.h>
int main() { dispatch_apply(1, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(size_t) { }); }"
HAVE_DISPATCH_APPLY)
endif()
# Set up flags for MSVC
if (MSVC)
set( CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}" )
endif (MSVC)
# Set up flags for GCC
- fixed the setup. Renamed all elements still referring to zdoom. removed the frontend specific resource data. fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
2019-09-22 23:28:18 +00:00
if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if( PROFILE )
set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -pg" )
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg" )
set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -pg" )
set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -pg" )
endif()
- almost got it all compiled on linux
2020-01-20 09:09:44 +00:00
#set( REL_CXX_FLAGS "-fno-rtti" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if( NOT PROFILE AND NOT APPLE )
# On OS X frame pointers are required for exception handling, at least with Clang
set( REL_CXX_FLAGS "${REL_CXX_FLAGS} -fomit-frame-pointer" )
endif()
set( CMAKE_CXX_FLAGS_RELEASE "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}" )
set( CMAKE_CXX_FLAGS_MINSIZEREL "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_MINSIZEREL}" )
set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" )
# Support for the GCC/Clang sanitizers.
set( WITH_ASAN 0 CACHE BOOL "Enable the Address Sanitizer")
if( NOT CMAKE_COMPILER_IS_GNUCXX )
set( WITH_MSAN 0 CACHE BOOL "Enable the Memory Sanitizer")
endif( NOT CMAKE_COMPILER_IS_GNUCXX )
set( WITH_UBSAN 0 CACHE BOOL "Enable the Undefined Behavior Sanitizer")
if( WITH_MSAN )
if ( WITH_ASAN OR WITH_UBSAN )
message( SEND_ERROR "You can't use MSAN with either ASAN or UBSAN." )
endif ( WITH_ASAN OR WITH_UBSAN )
endif( WITH_MSAN )
set( SANITIZER_FLAG "" )
if( WITH_ASAN )
set( SANITIZER_FLAG "-fsanitize=address" )
if ( WITH_UBSAN )
set( SANITIZER_FLAG "${SANITIZER_FLAG},undefined" )
endif( WITH_UBSAN )
elseif( WITH_MSAN )
set( SANITIZER_FLAG "-fsanitize=memory" )
elseif( WITH_UBSAN )
set( SANITIZER_FLAG "-fsanitize=undefined" )
endif( WITH_ASAN )
set( CMAKE_CXX_FLAGS "${SANITIZER_FLAG} ${CMAKE_CXX_FLAGS}" )
set( CMAKE_C_FLAGS "${SANITIZER_FLAG} ${CMAKE_C_FLAGS}" )
set( CMAKE_EXE_LINKER_FLAGS "${SANITIZER_FLAG} ${CMAKE_EXE_LINKER_FLAGS}" )
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" )
set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
endif()
if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
if( APPLE OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.6" )
set( CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override ${CMAKE_CXX_FLAGS}" )
endif()
endif()
set( CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -ffp-contract=off ${CMAKE_C_FLAGS}" )
set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -ffp-contract=off ${CMAKE_CXX_FLAGS}" )
# ARM processors (Raspberry Pi, et al) - enable ARM NEON support.
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
set (USE_ARMV8 0 CACHE BOOL "Use ARMv8 instructions - Raspberry Pi 3")
if (USE_ARMV8)
set( CMAKE_CXX_FLAGS "-mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mtune=cortex-a53 -mhard-float -DNO_SSE ${CMAKE_CXX_FLAGS}" )
else ()
set( CMAKE_CXX_FLAGS "-mcpu=cortex-a7 -mfpu=neon-vfpv4 -mtune=cortex-a7 -mhard-float -DNO_SSE ${CMAKE_CXX_FLAGS}" )
endif ()
endif ()
if( NOT X64 AND NOT CAN_DO_MFPMATH )
set( CMAKE_C_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" )
set( CMAKE_CXX_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" )
endif()
# Remove extra warnings when using the official DirectX headers.
# Also, TDM-GCC 4.4.0 no longer accepts glibc-style printf formats as valid,
# which is a royal pain. The previous version I had been using was fine with them.
# MinGW: switch to the Windows Unicode API.
if( WIN32 )
set( CMAKE_CXX_FLAGS "-Wno-unknown-pragmas -Wno-comment -Wno-format ${CMAKE_CXX_FLAGS}" )
set( CMAKE_CXX_FLAGS "-D_UNICODE -DUNICODE ${CMAKE_CXX_FLAGS}" )
set( CMAKE_CXX_FLAGS "-D_WIN32_WINNT=0x0600 ${CMAKE_CXX_FLAGS}" )
set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode" )
endif()
# Detect FreeBSD and add flags
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
endif()
if( NOT NO_STRIP )
set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s" )
set (CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -s" )
endif()
endif()
# Check for thread_local keyword, it's optional at the moment
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
#CHECK_CXX_SOURCE_COMPILES("thread_local int i; int main() { i = 0; }"
# HAVE_THREAD_LOCAL)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
#if( NOT HAVE_THREAD_LOCAL )
# message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" )
#endif()
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# Check for functions that may or may not exist.
CHECK_FUNCTION_EXISTS( filelength FILELENGTH_EXISTS )
if( FILELENGTH_EXISTS )
add_definitions( -DHAVE_FILELENGTH=1 )
endif()
CHECK_FUNCTION_EXISTS( strupr STRUPR_EXISTS )
if( NOT STRUPR_EXISTS )
add_definitions( -DNEED_STRUPR=1 )
endif()
CHECK_FUNCTION_EXISTS( stricmp STRICMP_EXISTS )
if( NOT STRICMP_EXISTS )
add_definitions( -Dstricmp=strcasecmp )
endif()
CHECK_FUNCTION_EXISTS( strnicmp STRNICMP_EXISTS )
if( NOT STRNICMP_EXISTS )
add_definitions( -Dstrnicmp=strncasecmp )
endif()
if( NOT MSVC )
add_definitions( -D__forceinline=inline )
endif()
if( UNIX )
CHECK_LIBRARY_EXISTS( rt clock_gettime "" CLOCK_GETTIME_IN_RT )
if( NOT CLOCK_GETTIME_IN_RT )
CHECK_FUNCTION_EXISTS( clock_gettime CLOCK_GETTIME_EXISTS )
if( NOT CLOCK_GETTIME_EXISTS )
message( STATUS "Could not find clock_gettime. Timing statistics will not be available." )
add_definitions( -DNO_CLOCK_GETTIME )
endif()
else()
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} rt )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
endif()
# Flags
# Update gitinfo.h
add_custom_target( revision_check ALL
- added the special colormaps for the texture compositor.
2020-04-11 22:16:14 +00:00
COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_SOURCE_DIR}/tools/updaterevision/UpdateRevision.cmake" source/gitinfo.h
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- little bit of CMake cleanup.
2019-12-26 13:16:00 +00:00
# required libraries
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- sound backend update.
2020-02-09 12:26:51 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if (HAVE_VULKAN)
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "glslang" "SPIRV" "OGLCompiler")
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
- sound backend update.
2020-02-09 12:26:51 +00:00
# ZMUSIC
- made ZMusic library required for non-MSVC targets
2020-02-09 14:48:07 +00:00
if( MSVC )
find_package( ZMusic )
else()
- require ZMusic library for non-MSVC targets This improves error reporting when ZMusic was not found during CMake configuration step
2020-04-13 08:28:31 +00:00
find_package( ZMusic REQUIRED )
- made ZMusic library required for non-MSVC targets
2020-02-09 14:48:07 +00:00
endif()
- sound backend update.
2020-02-09 12:26:51 +00:00
if( MSVC AND NOT ZMUSIC_FOUND )
# Use prebuilt library
set( ZMUSIC_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../bin/windows/zmusic" )
set( ZMUSIC_INCLUDE_DIR ${ZMUSIC_ROOT_PATH}/include )
set( ZMUSIC_LIBRARIES zmusiclite )
if( X64 )
link_directories( ${ZMUSIC_ROOT_PATH}/64bit )
else()
link_directories( ${ZMUSIC_ROOT_PATH}/32bit )
endif()
set( ZMUSIC_FOUND TRUE )
endif()
- configured use of libvpx for all platforms MSVC uses libvpx stored in the repository if lookup for external headers and libraries failed
2020-01-28 09:04:48 +00:00
# VPX
if( MSVC AND NOT VPX_FOUND )
# Use prebuilt library
set( VPX_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../platform/Windows" )
set( VPX_INCLUDE_DIR ${VPX_ROOT_PATH}/include )
set( VPX_LIBRARIES libvpx libcompat-to-msvc )
if( X64 )
link_directories( ${VPX_ROOT_PATH}/lib/64 )
else()
link_directories( ${VPX_ROOT_PATH}/lib/32 )
# Workaround for "error LNK2026: module unsafe for SAFESEH image."
set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO" )
endif()
set( VPX_FOUND TRUE )
endif()
if( VPX_FOUND )
add_definitions( "-DUSE_LIBVPX=1" )
include_directories( "${VPX_INCLUDE_DIR}" )
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} )
endif()
include_directories( "${ZLIB_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GDTOA_INCLUDE_DIR}" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if (WIN32)
- configured use of libvpx for all platforms MSVC uses libvpx stored in the repository if lookup for external headers and libraries failed
2020-01-28 09:04:48 +00:00
include_directories( "platform/win32" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
if( ${HAVE_VM_JIT} )
add_definitions( -DHAVE_VM_JIT )
include_directories( "${ASMJIT_INCLUDE_DIR}" )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}")
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
# Start defining source files for ZDoom
set( PLAT_WIN32_SOURCES
platform/win32/i_steam.cpp
common/platform/win32/hardware.cpp
common/platform/win32/i_crash.cpp
common/platform/win32/i_input.cpp
common/platform/win32/i_keyboard.cpp
common/platform/win32/i_mouse.cpp
common/platform/win32/i_dijoy.cpp
common/platform/win32/i_rawps2.cpp
common/platform/win32/i_xinput.cpp
common/platform/win32/i_main.cpp
common/platform/win32/i_system.cpp
common/platform/win32/i_specialpaths.cpp
common/platform/win32/st_start.cpp
common/platform/win32/st_start_util.cpp
common/platform/win32/gl_sysfb.cpp
common/platform/win32/base_sysfb.cpp
common/platform/win32/win32basevideo.cpp
common/platform/win32/win32glvideo.cpp
common/platform/win32/win32polyvideo.cpp)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
if (HAVE_VULKAN)
set (PLAT_WIN32_SOURCES ${PLAT_WIN32_SOURCES} common/platform/win32/win32vulkanvideo.cpp )
endif()
Project update for Posix sources
2020-01-06 01:35:27 +00:00
set( PLAT_POSIX_SOURCES
- updated the platform code to be mostly identical with GZDoom
2020-04-23 19:18:40 +00:00
platform/posix/i_steam.cpp
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/platform/posix/i_system_posix.cpp )
Project update for Posix sources
2020-01-06 01:35:27 +00:00
set( PLAT_SDL_SOURCES
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/platform/posix/sdl/crashcatcher.c
common/platform/posix/sdl/hardware.cpp
common/platform/posix/sdl/i_gui.cpp
common/platform/posix/sdl/i_input.cpp
common/platform/posix/sdl/i_joystick.cpp
common/platform/posix/sdl/i_main.cpp
common/platform/posix/sdl/i_system.cpp
common/platform/posix/sdl/sdlglvideo.cpp
common/platform/posix/sdl/st_start.cpp )
Project update for Posix sources
2020-01-06 01:35:27 +00:00
set( PLAT_UNIX_SOURCES
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/platform/posix/unix/i_specialpaths.cpp
common/platform/posix/unix/gtk_dialogs.cpp )
Project update for Posix sources
2020-01-06 01:35:27 +00:00
set( PLAT_OSX_SOURCES
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/platform/posix/osx/iwadpicker_cocoa.mm
common/platform/posix/osx/i_specialpaths.mm
- setup icon for macOS application bundle
2020-01-26 14:39:10 +00:00
platform/posix/osx/raze.icns )
Project update for Posix sources
2020-01-06 01:35:27 +00:00
set( PLAT_COCOA_SOURCES
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/platform/posix/cocoa/i_input.mm
common/platform/posix/cocoa/i_joystick.cpp
common/platform/posix/cocoa/i_main.mm
common/platform/posix/cocoa/i_system.mm
common/platform/posix/cocoa/i_video.mm
common/platform/posix/cocoa/st_console.mm
common/platform/posix/cocoa/st_start.mm )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if( WIN32 )
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
set( SYSTEM_SOURCES_DIR common/platform/win32 )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( SYSTEM_SOURCES ${PLAT_WIN32_SOURCES} )
set( OTHER_SYSTEM_SOURCES ${PLAT_POSIX_SOURCES} ${PLAT_SDL_SOURCES} ${PLAT_OSX_SOURCES} ${PLAT_COCOA_SOURCES} ${PLAT_UNIX_SOURCES} )
- fixed the setup. Renamed all elements still referring to zdoom. removed the frontend specific resource data. fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
2019-09-22 23:28:18 +00:00
set( SYSTEM_SOURCES ${SYSTEM_SOURCES} platform/win32/gameres.rc )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
elseif( APPLE )
if( OSX_COCOA_BACKEND )
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
set( SYSTEM_SOURCES_DIR common/platform/posix common/platform/posix/cocoa )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( SYSTEM_SOURCES ${PLAT_COCOA_SOURCES} )
set( OTHER_SYSTEM_SOURCES ${PLAT_WIN32_SOURCES} ${PLAT_SDL_SOURCES} ${PLAT_UNIX_SOURCES} )
else()
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
set( SYSTEM_SOURCES_DIR common/platform/posix common/platform/posix/sdl )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( SYSTEM_SOURCES ${PLAT_SDL_SOURCES} )
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
set( PLAT_OSX_SOURCES ${PLAT_OSX_SOURCES} common/platform/posix/sdl/i_system.mm )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( OTHER_SYSTEM_SOURCES ${PLAT_WIN32_SOURCES} ${PLAT_COCOA_SOURCES} ${PLAT_UNIX_SOURCES} )
endif()
set( SYSTEM_SOURCES ${SYSTEM_SOURCES} ${PLAT_POSIX_SOURCES} ${PLAT_OSX_SOURCES} )
Project update for Posix sources
2020-01-06 01:35:27 +00:00
set_source_files_properties( platform/posix/osx/${PROJECT_NAME}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
set_source_files_properties( common/platform/posix/osx/iwadpicker_cocoa.mm PROPERTIES COMPILE_FLAGS -fobjc-exceptions )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
else()
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
set( SYSTEM_SOURCES_DIR common/platform/posix common/platform/posix/sdl )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( SYSTEM_SOURCES ${PLAT_POSIX_SOURCES} ${PLAT_SDL_SOURCES} ${PLAT_UNIX_SOURCES} )
set( OTHER_SYSTEM_SOURCES ${PLAT_WIN32_SOURCES} ${PLAT_OSX_SOURCES} ${PLAT_COCOA_SOURCES} )
endif()
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
if( HAVE_MMX )
add_definitions( -DHAVE_MMX=1 )
set( SYSTEM_SOURCES ${SYSTEM_SOURCES}
common/textures/hires/hqnx_asm/hq2x_asm.cpp
common/textures/hires/hqnx_asm/hq3x_asm.cpp
common/textures/hires/hqnx_asm/hq4x_asm.cpp
common/textures/hires/hqnx_asm/hqnx_asm_Image.cpp)
if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
set_source_files_properties(
common/textures/hires/hqnx_asm/hq2x_asm.cpp
common/textures/hires/hqnx_asm/hq3x_asm.cpp
common/textures/hires/hqnx_asm/hq4x_asm.cpp
common/textures/hires/hqresize.cpp
PROPERTIES COMPILE_FLAGS "-mmmx" )
endif( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
endif( HAVE_MMX )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if( HAVE_PARALLEL_FOR )
add_definitions( -DHAVE_PARALLEL_FOR=1 )
elseif( HAVE_DISPATCH_APPLY )
add_definitions( -DHAVE_DISPATCH_APPLY=1 )
else()
option( NO_OPENMP "Disable usage of OpenMP" OFF )
if( NOT NO_OPENMP )
include( FindOpenMP )
if( OPENMP_FOUND )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
endif( OPENMP_FOUND )
endif( NOT NO_OPENMP )
endif()
- added the script compiler's front end.
2020-04-07 22:19:49 +00:00
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h
COMMAND lemon -C${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/frontend/zcc-parse.lemon
DEPENDS lemon ${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/frontend/zcc-parse.lemon )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/common/engine/sc_man_scanner.re
DEPENDS re2c ${CMAKE_CURRENT_SOURCE_DIR}/common/engine/sc_man_scanner.re )
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
#option( SEND_ANON_STATS "Enable sending of anonymous hardware statistics" ON )
#if( NOT SEND_ANON_STATS )
# add_definitions( -DNO_SEND_STATS )
#endif()
# Project files should be aware of the header files. We can GLOB these since
# there's generally a new cpp for every header so this file will get changed
file( GLOB HEADER_FILES
build/include/*.h
glbackend/*.h
libsmackerdec/include/*.h
libxmp-lite/include/libxmp-lite/*.h
libxmp-lite/src/*.h
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/*.h
core/2d/*.h
core/utility/*.h
core/utility/rapidjson/*.h
core/console/*.h
core/music/*.h
core/menu/*.h
core/input/*.h
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- moved sound code to "common".
2020-04-12 06:19:19 +00:00
common/audio/sound/thirdparty/*.h
common/audio/sound/*.h
- moved music code to "common"
2020-04-12 06:08:31 +00:00
common/audio/music/*.h*
- use GZDoom's 2D drawer. Console and menu font colors are not ok yet, aside from that it works.
2020-05-25 15:11:32 +00:00
common/2d/*.h
- moved music code to "common"
2020-04-12 06:08:31 +00:00
common/console/*.h
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/utility/*.h
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/engine/*.h
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/menu/*.h
- use GZDoom's font code to fix the crash issues and moved around some files in the PK3. This pulls in a lot of Doom specific font setup, this can be sorted out later as it won't get into the way. # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/hw_draw2d.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/gl_texture.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/build/src/palette.cpp # source/core/gamecontrol.cpp
2020-04-05 20:51:53 +00:00
common/fonts/*.h
- added DObject as a preparation for the ZScript compiler. Currently large parts are disabled because the backing features are not present yet. # Conflicts: # source/CMakeLists.txt
2020-04-06 14:10:54 +00:00
common/objects/*.h
- file system update and adjustment.
2020-04-11 21:54:33 +00:00
common/filesystem/*.h
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/platform/posix/cocoa/*.h
common/platform/posix/sdl/*.h
common/platform/win32/*.h
- backend update with GZDoom model code.
2020-05-30 22:01:00 +00:00
common/models/*.h
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/textures/*.h
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/hires/hqnx/*.h
common/textures/hires/hqnx_asm/*.h
common/textures/hires/xbr/*.h
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/thirdparty/*.h
common/thirdparty/rapidjson/*.h
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
common/thirdparty/math/*h
- updated common code. Most of what got added is still unused. # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/common/engine/i_interface.h
2020-04-25 22:01:04 +00:00
common/rendering/*.h
- moved gl_load to 'common'. # Conflicts: # source/CMakeLists.txt # source/common/rendering/gl_load/gl_interface.cpp
2020-04-10 20:17:29 +00:00
common/rendering/gl_load/*.h
- use the engine backend to render the scene
2020-06-11 16:40:53 +00:00
common/rendering/hwrenderer/*.h
- updated common code. Most of what got added is still unused. # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/common/engine/i_interface.h
2020-04-25 22:01:04 +00:00
common/rendering/hwrenderer/data/*.h
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
common/rendering/polyrenderer/*.h
common/rendering/polyrenderer/math/*.h
common/rendering/polyrenderer/drawers/*.h
common/rendering/polyrenderer/backend/*.h
common/rendering/vulkan/*.h
common/rendering/vulkan/system/*.h
common/rendering/vulkan/renderer/*.h
common/rendering/vulkan/shaders/*.h
common/rendering/vulkan/textures/*.h
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
common/scripting/core/*h
common/scripting/vm/*h
common/scripting/jit/*h
common/scripting/interface/*.h
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
common/scripting/backend/*.h
- added the script compiler's front end.
2020-04-07 22:19:49 +00:00
common/scripting/frontend/*.h
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
build/src/*.h
- added GZDoom's Windows backend code. Compiles but doesn't link yet.
2019-12-22 19:55:47 +00:00
platform/win32/*.h
- added POSIX source files to generated projects
2020-01-26 14:40:43 +00:00
platform/posix/*.h
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
thirdparty/include/*.h
thirdparty/include/*.hpp
font - Dear ImGUI test.
2019-11-07 19:31:16 +00:00
thirdparty/imgui/*.h
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/textures/*.h
core/textures/formats/*.h
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
set( POLYRENDER_SOURCES
common/rendering/polyrenderer/drawers/poly_triangle.cpp
common/rendering/polyrenderer/drawers/poly_thread.cpp
common/rendering/polyrenderer/drawers/screen_triangle.cpp
common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
common/rendering/polyrenderer/drawers/screen_shader.cpp
common/rendering/polyrenderer/drawers/screen_blend.cpp
)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# These files will be flagged as "headers" so that they appear in project files
# without being compiled.
set( NOT_COMPILED_SOURCE_FILES
${OTHER_SYSTEM_SOURCES}
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
${POLYRENDER_SOURCES}
- added GZDoom's font code and some dependencies.
2019-10-23 23:20:58 +00:00
sc_man_scanner.h
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/engine/sc_man_scanner.re
- added the script compiler's front end.
2020-04-07 22:19:49 +00:00
common/scripting/frontend/zcc-parse.lemon
zcc-parse.c
zcc-parse.h
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/platform/win32/zutil.natvis
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
- reactivated some more code after integrating the VM core. There's a few bits here and there that only have meaning in Doom but they are kept to allow using the same unaltered source files in both engines.
2020-04-06 21:32:29 +00:00
set( VM_JIT_SOURCES
common/scripting/jit/jit.cpp
common/scripting/jit/jit_runtime.cpp
common/scripting/jit/jit_call.cpp
common/scripting/jit/jit_flow.cpp
common/scripting/jit/jit_load.cpp
common/scripting/jit/jit_math.cpp
common/scripting/jit/jit_move.cpp
common/scripting/jit/jit_store.cpp
)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# Enable fast math for some sources where performance matters (or where the PCH must not be used.) (This would be good for rendering code, but unfortunately that is hopelessly intermingled with the playsim code in engine.cpp.)
set( FASTMATH_SOURCES
- moved gl_load to 'common'. # Conflicts: # source/CMakeLists.txt # source/common/rendering/gl_load/gl_interface.cpp
2020-04-10 20:17:29 +00:00
common/rendering/gl_load/gl_load.c
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
common/rendering/polyrenderer/poly_all.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/hires/hqnx/init.cpp
common/textures/hires/hqnx/hq2x.cpp
common/textures/hires/hqnx/hq3x.cpp
common/textures/hires/hqnx/hq4x.cpp
common/textures/hires/xbr/xbrz.cpp
common/textures/hires/xbr/xbrz_old.cpp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# This should better be made a library subproject later, once things are working.
libsmackerdec/src/BitReader.cpp
libsmackerdec/src/FileStream.cpp
libsmackerdec/src/HuffmanVLC.cpp
libsmackerdec/src/LogError.cpp
libsmackerdec/src/SmackerDecoder.cpp
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/utility/matrix.cpp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# The rest is only here because it is C, not C++
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- rewrote the screenshot code to use m_png as its backend. Mainly to finally get rid of kplib. There's really no use to keep such code around if alternatives are already present.
2019-11-02 11:59:59 +00:00
gitinfo.cpp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
#Vulkan stuff must go into a separate list because it needs to be disabled for some platforms
set (VULKAN_SOURCES
common/rendering/vulkan/system/vk_device.cpp
common/rendering/vulkan/system/vk_swapchain.cpp
common/rendering/vulkan/system/vk_builders.cpp
common/rendering/vulkan/system/vk_framebuffer.cpp
common/rendering/vulkan/system/vk_buffers.cpp
common/rendering/vulkan/renderer/vk_renderstate.cpp
common/rendering/vulkan/renderer/vk_renderpass.cpp
common/rendering/vulkan/renderer/vk_streambuffer.cpp
common/rendering/vulkan/renderer/vk_postprocess.cpp
common/rendering/vulkan/renderer/vk_renderbuffers.cpp
common/rendering/vulkan/shaders/vk_shader.cpp
common/rendering/vulkan/textures/vk_samplers.cpp
common/rendering/vulkan/textures/vk_hwtexture.cpp
common/rendering/vulkan/textures/vk_imagetransition.cpp
common/rendering/vulkan/thirdparty/volk/volk.c
common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.cpp
)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
if (HAVE_VULKAN)
set (FASTMATH_SOURCES ${FASTMATH_SOURCES} ${VULKAN_SOURCES})
endif()
set (POLYBACKEND_SOURCES
common/rendering/polyrenderer/backend/poly_framebuffer.cpp
common/rendering/polyrenderer/backend/poly_buffers.cpp
common/rendering/polyrenderer/backend/poly_hwtexture.cpp
common/rendering/polyrenderer/backend/poly_renderstate.cpp
)
set (FASTMATH_SOURCES ${FASTMATH_SOURCES} ${POLYBACKEND_SOURCES})
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set (PCH_SOURCES
- removed DObject. Just for the menu this can be done much simpler - the entire setup here doesn't work well with the game frontends being compiled as separate modules anyway.
2019-11-26 20:25:45 +00:00
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
glbackend/glbackend.cpp
- moved the palette management into the backend.
2019-10-06 19:15:53 +00:00
glbackend/gl_palmanager.cpp
- renamed texcache.cpp and moved it to its proper place. The old content no longer exists, this is entirely backend code now.
2019-10-20 06:04:54 +00:00
glbackend/gl_texture.cpp
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- various fixes and improvements related to file location management: * saving of demos and savegames no longer mindlessly writes to the mod directory. All such access is now being rerouted through the special paths interface so that the game data can reside in write protected locations. * refactored all occurences of klistpath except fnlist_getnames. * do not allow CON scripts to write to arbitrary files. This is a massive exploit and can be used to cause real damage if someone knows how to play this thing - it's far easier than people may think! It will now write any such data to a special section in the main config which is safe and cannot be manipulated to write to random locations on the hard drive.
2019-11-01 23:38:30 +00:00
thirdparty/src/base64.cpp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
thirdparty/src/md4.cpp
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# Todo: Split out the license-safe code from this.
build/src/clip.cpp
build/src/defs.cpp
build/src/engine.cpp
build/src/mdsprite.cpp
build/src/polymost.cpp
build/src/voxmodel.cpp
- first attempt to compile on a Mac This could have gone better, there's far too many warnings here
2020-01-06 01:41:47 +00:00
- adapted the MVE player. Video appears to work, but has quite severe artifacting I cannot tell if it's the video or the decoder which causes it.
2020-07-23 20:26:07 +00:00
core/movie/playmve.cpp
- hooked up the new automap framework.
2020-09-06 10:44:58 +00:00
core/automap.cpp
- implemented the 'god' cheat as a network command. This was mainly chosen as something simple to get the basics set up.
2020-09-02 22:29:17 +00:00
core/cheats.cpp
- simplified the generic cheat code. This is both closer to ZDoom and more robust.
2020-07-04 08:22:20 +00:00
core/cheathandler.cpp
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
core/mathutil.cpp
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/rts.cpp
- cheat and chat code from ZDoom. Not active yet because it does not integrate with the current input code, but at least it's there now. # Conflicts: # source/build/include/baselayer.h
2020-05-17 06:51:49 +00:00
core/ct_chat.cpp
- hooked up ZDoom's d_net.cpp file. Still not active but this contains some code needed to do a proper main loop that can work with the networker.
2020-08-29 21:24:18 +00:00
core/d_net.cpp
core/d_protocol.cpp
- continued work on main loop - added a few new entry points to the game interface.
2020-08-29 22:55:49 +00:00
core/mainloop.cpp
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/gameconfigfile.cpp
core/gamecvars.cpp
core/gamecontrol.cpp
core/inputstate.cpp
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
core/maphack.cpp
- safety commit - does not compile!
2020-07-07 11:19:09 +00:00
core/mapinfo.cpp
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/searchpaths.cpp
- added some ZScript basics. This is merely the basics needed to actually implement something.
2020-06-20 07:46:41 +00:00
core/screenjob.cpp
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/initfs.cpp
core/statistics.cpp
core/secrets.cpp
core/compositesavegame.cpp
core/savegamehelp.cpp
core/quotes.cpp
core/screenshot.cpp
- update of music code, in particular separating the engine-specific lookup from the backend. # Conflicts: # source/core/music/music.cpp # Conflicts: # source/build/src/palette.cpp
2020-04-12 06:07:48 +00:00
core/raze_music.cpp
- matching sound backend code with GZDoom. # Conflicts: # source/core/sound/s_soundinternal.h
2020-04-12 06:09:38 +00:00
core/raze_sound.cpp
- moved palette.cpp out of Build folder.
2020-06-07 11:06:18 +00:00
core/palette.cpp
- added the entry point for the ZScript compiler.
2020-06-14 17:20:04 +00:00
core/zcompile.cpp
- prepared folder for merging.
2020-06-21 20:18:12 +00:00
core/statusbar.cpp
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/console/c_console.cpp
core/console/d_event.cpp
- moved sound code to "common".
2020-04-12 06:19:19 +00:00
common/audio/sound/i_sound.cpp
common/audio/sound/oalsound.cpp
common/audio/sound/s_environment.cpp
common/audio/sound/s_sound.cpp
- backend update to make the ZScript compiler work.
2020-06-14 16:57:55 +00:00
#common/audio/sound/s_reverbedit.cpp
- moved music code to "common"
2020-04-12 06:08:31 +00:00
common/audio/music/music_midi_base.cpp
common/audio/music/music.cpp
common/audio/music/i_music.cpp
common/audio/music/i_soundfont.cpp
common/audio/music/music_config.cpp
- use GZDoom's 2D drawer. Console and menu font colors are not ok yet, aside from that it works.
2020-05-25 15:11:32 +00:00
common/2d/v_2ddrawer.cpp
common/2d/v_drawtext.cpp
common/2d/v_draw.cpp
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/thirdparty/sfmt/SFMT.cpp
- use GZDoom's font code to fix the crash issues and moved around some files in the PK3. This pulls in a lot of Doom specific font setup, this can be sorted out later as it won't get into the way. # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/hw_draw2d.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/gl_texture.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/build/src/palette.cpp # source/core/gamecontrol.cpp
2020-04-05 20:51:53 +00:00
common/fonts/singlelumpfont.cpp
common/fonts/singlepicfont.cpp
common/fonts/specialfont.cpp
common/fonts/font.cpp
common/fonts/hexfont.cpp
common/fonts/v_font.cpp
- use GZDoom's 2D drawer. Console and menu font colors are not ok yet, aside from that it works.
2020-05-25 15:11:32 +00:00
common/fonts/v_text.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/hw_ihwtexture.cpp
common/textures/hw_material.cpp
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/textures/bitmap.cpp
- m_png.cpp is common.
2020-04-11 22:17:01 +00:00
common/textures/m_png.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/texture.cpp
- updated to GZDoom's new texture management system.
2020-05-25 21:59:07 +00:00
common/textures/gametexture.cpp
- moved filesa to common
2020-05-23 21:53:38 +00:00
common/textures/image.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/imagetexture.cpp
- added GZDoom's texture manager. It doesn't do anything yet, but it can now be used to manage textures.
2020-05-24 14:11:10 +00:00
common/textures/texturemanager.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/multipatchtexturebuilder.cpp
common/textures/skyboxtexture.cpp
- use GZDoom's font code to fix the crash issues and moved around some files in the PK3. This pulls in a lot of Doom specific font setup, this can be sorted out later as it won't get into the way. # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/hw_draw2d.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/gl_texture.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/build/src/palette.cpp # source/core/gamecontrol.cpp
2020-04-05 20:51:53 +00:00
common/textures/animtexture.cpp
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
common/textures/v_collection.cpp
- added a texture format for single frame ANMs so that they can be handled like normal images. The intermission code is doing weird things with them that isn't really portable.
2020-06-28 12:41:44 +00:00
common/textures/animlib.cpp
- added the other image formats from GZDoom.
2020-05-23 22:15:38 +00:00
common/textures/formats/automaptexture.cpp
common/textures/formats/brightmaptexture.cpp
common/textures/formats/buildtexture.cpp
- moved filesa to common
2020-05-23 21:53:38 +00:00
common/textures/formats/ddstexture.cpp
- added the other image formats from GZDoom.
2020-05-23 22:15:38 +00:00
common/textures/formats/flattexture.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/formats/fontchars.cpp
- added the other image formats from GZDoom.
2020-05-23 22:15:38 +00:00
common/textures/formats/imgztexture.cpp
- moved filesa to common
2020-05-23 21:53:38 +00:00
common/textures/formats/jpegtexture.cpp
- added the other image formats from GZDoom.
2020-05-23 22:15:38 +00:00
common/textures/formats/md5check.cpp
common/textures/formats/multipatchtexture.cpp
common/textures/formats/patchtexture.cpp
- moved filesa to common
2020-05-23 21:53:38 +00:00
common/textures/formats/pcxtexture.cpp
common/textures/formats/pngtexture.cpp
- added the other image formats from GZDoom.
2020-05-23 22:15:38 +00:00
common/textures/formats/rawpagetexture.cpp
common/textures/formats/emptytexture.cpp
common/textures/formats/shadertexture.cpp
- moved filesa to common
2020-05-23 21:53:38 +00:00
common/textures/formats/tgatexture.cpp
common/textures/formats/stbtexture.cpp
- added a texture format for single frame ANMs so that they can be handled like normal images. The intermission code is doing weird things with them that isn't really portable.
2020-06-28 12:41:44 +00:00
common/textures/formats/anmtexture.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/hires/hqresize.cpp
- backend update with GZDoom model code.
2020-05-30 22:01:00 +00:00
common/models/models_md3.cpp
common/models/models_md2.cpp
common/models/models_voxel.cpp
common/models/models_ue1.cpp
common/models/models_obj.cpp
common/models/model.cpp
common/models/voxels.cpp
- match with GZDoom's console code, move to 'common'.
2020-04-11 22:11:50 +00:00
common/console/c_commandline.cpp
common/console/c_buttons.cpp
common/console/c_bind.cpp
common/console/c_enginecmds.cpp
common/console/c_consolebuffer.cpp
common/console/c_cvars.cpp
common/console/c_dispatch.cpp
common/console/c_expr.cpp
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/utility/engineerrors.cpp
common/utility/i_module.cpp
common/utility/m_alloc.cpp
common/utility/utf8.cpp
common/utility/palette.cpp
common/utility/files.cpp
common/utility/files_decompress.cpp
common/utility/memarena.cpp
common/utility/cmdlib.cpp
common/utility/configfile.cpp
common/utility/i_time.cpp
common/utility/m_argv.cpp
common/utility/s_playlist.cpp
common/utility/zstrformat.cpp
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/utility/name.cpp
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
common/utility/r_memory.cpp
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/thirdparty/md5.cpp
common/thirdparty/superfasthash.cpp
- file system update and adjustment.
2020-04-11 21:54:33 +00:00
common/filesystem/filesystem.cpp
common/filesystem/ancientzip.cpp
common/filesystem/file_7z.cpp
common/filesystem/file_grp.cpp
common/filesystem/file_lump.cpp
common/filesystem/file_rff.cpp
common/filesystem/file_wad.cpp
common/filesystem/file_zip.cpp
common/filesystem/file_pak.cpp
common/filesystem/file_whres.cpp
- added support for SSI containers to the file system.
2020-09-19 08:07:53 +00:00
common/filesystem/file_ssi.cpp
- file system update and adjustment.
2020-04-11 21:54:33 +00:00
common/filesystem/file_directory.cpp
common/filesystem/resourcefile.cpp
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
common/engine/cycler.cpp
- backend update to make the ZScript compiler work.
2020-06-14 16:57:55 +00:00
common/engine/d_event.cpp
- cleanup
2020-04-08 16:53:47 +00:00
common/engine/stats.cpp
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/engine/sc_man.cpp
- use a global constant for the transparent palette index instead of hardcoding it to the 255 literal everywhere. - added the needed glue to allow palettecontainer.cpp to compile.
2020-04-11 22:18:12 +00:00
common/engine/palettecontainer.cpp
- match with GZDoom's console code, move to 'common'.
2020-04-11 22:11:50 +00:00
common/engine/stringtable.cpp
- hooked up ZDoom's d_net.cpp file. Still not active but this contains some code needed to do a proper main loop that can work with the networker.
2020-08-29 21:24:18 +00:00
common/engine/i_net.cpp
- moved renderstyle to 'common' and use GZDoom's color table code unaltered. # Conflicts: # source/CMakeLists.txt # source/common/engine/serializer.h
2020-04-12 06:21:50 +00:00
common/engine/i_interface.cpp
common/engine/renderstyle.cpp
common/engine/v_colortables.cpp
- update "common" subfolder. # Conflicts: # source/CMakeLists.txt
2020-04-07 16:04:35 +00:00
common/engine/serializer.cpp
- backend update.
2020-06-11 07:15:44 +00:00
common/engine/m_joy.cpp
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
common/engine/m_random.cpp
- added DObject as a preparation for the ZScript compiler. Currently large parts are disabled because the backing features are not present yet. # Conflicts: # source/CMakeLists.txt
2020-04-06 14:10:54 +00:00
common/objects/dobject.cpp
common/objects/dobjgc.cpp
common/objects/dobjtype.cpp
- backend update to make the ZScript compiler work.
2020-06-14 16:57:55 +00:00
- moved video files to 'common'. # Conflicts: # source/blood/src/screen.cpp
2020-04-28 21:11:33 +00:00
common/rendering/v_framebuffer.cpp
common/rendering/v_video.cpp
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
common/rendering/r_thread.cpp
- updated common code. Most of what got added is still unused. # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/common/engine/i_interface.h
2020-04-25 22:01:04 +00:00
common/rendering/r_videoscale.cpp
- use the engine backend to render the scene
2020-06-11 16:40:53 +00:00
common/rendering/hwrenderer/hw_draw2d.cpp
- moved code around, got a few more utilities from GZDoom.
2020-05-31 08:41:59 +00:00
common/rendering/hwrenderer/data/hw_clock.cpp
common/rendering/hwrenderer/data/hw_skydome.cpp
- updated backend from GZDoom.
2020-04-26 21:17:54 +00:00
common/rendering/hwrenderer/data/flatvertices.cpp
common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
common/rendering/hwrenderer/data/hw_modelvertexbuffer.cpp
common/rendering/hwrenderer/data/hw_cvars.cpp
common/rendering/hwrenderer/data/hw_vrmodes.cpp
common/rendering/hwrenderer/data/hw_lightbuffer.cpp
common/rendering/hwrenderer/data/hw_aabbtree.cpp
common/rendering/hwrenderer/data/hw_shadowmap.cpp
common/rendering/hwrenderer/data/hw_shaderpatcher.cpp
- updated common code. Most of what got added is still unused. # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/common/engine/i_interface.h
2020-04-25 22:01:04 +00:00
common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp
- moved gl_load to 'common'. # Conflicts: # source/CMakeLists.txt # source/common/rendering/gl_load/gl_interface.cpp
2020-04-10 20:17:29 +00:00
common/rendering/gl_load/gl_interface.cpp
- moved code around, got a few more utilities from GZDoom.
2020-05-31 08:41:59 +00:00
common/rendering/gl/gl_renderer.cpp
common/rendering/gl/gl_stereo3d.cpp
common/rendering/gl/gl_framebuffer.cpp
- updated backend from GZDoom.
2020-04-26 21:17:54 +00:00
common/rendering/gl/gl_renderstate.cpp
common/rendering/gl/gl_renderbuffers.cpp
common/rendering/gl/gl_postprocess.cpp
common/rendering/gl/gl_postprocessstate.cpp
- use GZDoom's gl_samplers.cpp
2020-05-28 21:48:50 +00:00
common/rendering/gl/gl_debug.cpp
- updated backend from GZDoom.
2020-04-26 21:17:54 +00:00
common/rendering/gl/gl_buffers.cpp
- moved to GZDoom's gl_hwtexture.cpp.
2020-05-28 23:03:01 +00:00
common/rendering/gl/gl_hwtexture.cpp
- use GZDoom's gl_samplers.cpp
2020-05-28 21:48:50 +00:00
common/rendering/gl/gl_samplers.cpp
- updated backend from GZDoom.
2020-04-26 21:17:54 +00:00
common/rendering/gl/gl_shader.cpp
common/rendering/gl/gl_shaderprogram.cpp
- update "common" subfolder. # Conflicts: # source/CMakeLists.txt
2020-04-07 16:04:35 +00:00
common/scripting/core/dictionary.cpp
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
common/scripting/core/dynarrays.cpp
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
common/scripting/core/symbols.cpp
common/scripting/core/types.cpp
common/scripting/core/scopebarrier.cpp
common/scripting/core/vmdisasm.cpp
- added the script compiler's front end.
2020-04-07 22:19:49 +00:00
common/scripting/core/imports.cpp
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
common/scripting/vm/vmexec.cpp
common/scripting/vm/vmframe.cpp
common/scripting/interface/stringformat.cpp
- backend update to make the ZScript compiler work.
2020-06-14 16:57:55 +00:00
common/scripting/interface/vmnatives.cpp
- added the script compiler's front end.
2020-04-07 22:19:49 +00:00
common/scripting/frontend/ast.cpp
common/scripting/frontend/zcc_compile.cpp
common/scripting/frontend/zcc_parser.cpp
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
common/scripting/backend/vmbuilder.cpp
common/scripting/backend/codegen.cpp
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
- cleanup
2020-04-08 16:53:47 +00:00
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/textures/buildtiles.cpp
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
#core/textures/texture.cpp
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core/music/s_advsound.cpp
core/menu/imagescroller.cpp
core/menu/joystickmenu.cpp
core/menu/listmenu.cpp
core/menu/savegamemanager.cpp
core/menu/loadsavemenu.cpp
core/menu/menu.cpp
core/menu/menudef.cpp
core/menu/menuinput.cpp
core/menu/messagebox.cpp
core/menu/optionmenu.cpp
core/menu/resolutionmenu.cpp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
- reactivated some more code after integrating the VM core. There's a few bits here and there that only have meaning in Doom but they are kept to allow using the same unaltered source files in both engines.
2020-04-06 21:32:29 +00:00
if( ${HAVE_VM_JIT} )
set( PCH_SOURCES ${PCH_SOURCES} ${VM_JIT_SOURCES} )
else()
set( NOT_COMPILED_SOURCE_FILES ${NOT_COMPILED_SOURCE_FILES} ${VM_JIT_SOURCES} )
endif()
- streamlined CMake configuration of game libraries https://forum.zdoom.org/viewtopic.php?t=67121
2020-01-27 11:45:19 +00:00
macro( use_precompiled_header )
if( MSVC )
enable_precompiled_headers( "${ARGV0}/g_pch.h" PCH_SOURCES )
# The original Build code was written with unsigned chars and unfortunately they still haven't been eliminated entirely.
# All other code should stay with signed chars. What a mess... :(
else()
# Temporary solution for compilers other than MSVC
set_source_files_properties( ${PCH_SOURCES} PROPERTIES COMPILE_FLAGS "-include g_pch.h" )
endif()
endmacro()
use_precompiled_header(".")
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
add_executable( ${PROJECT_NAME} WIN32 MACOSX_BUNDLE
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
${HEADER_FILES}
${NOT_COMPILED_SOURCE_FILES}
- Linux compile fixes.
2020-04-19 19:53:21 +00:00
__autostart.cpp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
${SYSTEM_SOURCES}
${FASTMATH_SOURCES}
${PCH_SOURCES}
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/utility/x86.cpp
common/thirdparty/strnatcmp.c
common/utility/zstring.cpp
common/utility/findfile.cpp
common/thirdparty/math/asin.c
common/thirdparty/math/atan.c
common/thirdparty/math/const.c
common/thirdparty/math/cosh.c
common/thirdparty/math/exp.c
common/thirdparty/math/isnan.c
common/thirdparty/math/log.c
common/thirdparty/math/log10.c
common/thirdparty/math/mtherr.c
common/thirdparty/math/polevl.c
common/thirdparty/math/pow.c
common/thirdparty/math/powi.c
common/thirdparty/math/sin.c
common/thirdparty/math/sinh.c
common/thirdparty/math/sqrt.c
common/thirdparty/math/tan.c
common/thirdparty/math/tanh.c
common/thirdparty/math/fastsin.cpp
- Linux compile fixes.
2020-04-19 19:53:21 +00:00
zzautozend.cpp
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
- WIP keybinding cleanup
2019-12-02 01:07:32 +00:00
#set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${DEM_FASTMATH_FLAG} )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set_source_files_properties( xlat/parse_xlat.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c" )
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
set_source_files_properties( common/engine/sc_man.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE )
if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
# [BL] Solaris requires these to be explicitly linked.
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} nsl socket)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
if( UNIX )
find_package( Backtrace )
if(Backtrace_FOUND)
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${Backtrace_LIBRARIES} )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
endif()
- removed the old Duke and RR subprojects. These seriously stand in the way of backend cleanup that is needed to do a release based on the new code.
2020-07-14 11:09:34 +00:00
target_link_libraries( ${PROJECT_NAME} ${PROJECT_LIBRARIES} ${ZMUSIC_LIBRARIES} gdtoa lzma duke blood sw exhumed )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
include_directories(
- rewrote the screenshot code to use m_png as its backend. Mainly to finally get rid of kplib. There's really no use to keep such code around if alternatives are already present.
2019-11-02 11:59:59 +00:00
${CMAKE_CURRENT_SOURCE_DIR}
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
build/include
libxmp-lite/include
libxmp-lite/include/libxmp-lite
libsmackerdec/include
thirdparty/include
font - Dear ImGUI test.
2019-11-07 19:31:16 +00:00
thirdparty/imgui
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
core
core/2d
core/fonts
core/utility
core/console
core/textures
core/music
core/dobject
core/menu
core/input
- moved winbits.cpp to the platform folder and cleaned out unused parts.
2019-09-25 20:38:47 +00:00
platform
- moved sound code to "common".
2020-04-12 06:19:19 +00:00
common/audio/sound
- moved music code to "common"
2020-04-12 06:08:31 +00:00
common/audio/music
- use GZDoom's 2D drawer. Console and menu font colors are not ok yet, aside from that it works.
2020-05-25 15:11:32 +00:00
common/2d
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/thirdparty
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/textures
- added the other image formats from GZDoom.
2020-05-23 22:15:38 +00:00
common/textures/formats
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
common/textures/hires
- updated to GZDoom's new texture management system.
2020-05-25 21:59:07 +00:00
common/textures
- backend update with GZDoom model code.
2020-05-30 22:01:00 +00:00
common/models
- file system update and adjustment.
2020-04-11 21:54:33 +00:00
common/filesystem
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
common/utility
- match with GZDoom's console code, move to 'common'.
2020-04-11 22:11:50 +00:00
common/console
- backend code matching with GZDoom
2020-04-11 22:04:02 +00:00
common/engine
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
common/menu
- use GZDoom's font code to fix the crash issues and moved around some files in the PK3. This pulls in a lot of Doom specific font setup, this can be sorted out later as it won't get into the way. # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/hw_draw2d.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/glbackend/gl_texture.cpp # Conflicts: # source/CMakeLists.txt # Conflicts: # source/build/src/palette.cpp # source/core/gamecontrol.cpp
2020-04-05 20:51:53 +00:00
common/fonts
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
common/objects
- moved gl_load to 'common'. # Conflicts: # source/CMakeLists.txt # source/common/rendering/gl_load/gl_interface.cpp
2020-04-10 20:17:29 +00:00
common/rendering
- use the engine backend to render the scene
2020-06-11 16:40:53 +00:00
common/rendering/hwrenderer
- updated common code. Most of what got added is still unused. # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/build/src/palette.cpp # Conflicts: # source/common/engine/i_interface.h
2020-04-25 22:01:04 +00:00
common/rendering/hwrenderer/data
- moved gl_load to 'common'. # Conflicts: # source/CMakeLists.txt # source/common/rendering/gl_load/gl_interface.cpp
2020-04-10 20:17:29 +00:00
common/rendering/gl_load
- use GZDoom's gl_samplers.cpp
2020-05-28 21:48:50 +00:00
common/rendering/gl
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
common/rendering/vulkan/thirdparty
common/rendering/polyrenderer/backend
common/rendering/polyrenderer/drawers
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
common/scripting/vm
common/scripting/jit
- update "common" subfolder. # Conflicts: # source/CMakeLists.txt
2020-04-07 16:04:35 +00:00
common/scripting/core
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
common/scripting/interface
- added the script compiler's front end.
2020-04-07 22:19:49 +00:00
common/scripting/frontend
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
common/scripting/backend
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
../libraries/glslang/glslang/Public
../libraries/glslang/spirv
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
${CMAKE_BINARY_DIR}/libraries/gdtoa
- more macOS compilation fixes Still not complete…
2020-01-07 00:11:19 +00:00
${SYSTEM_SOURCES_DIR}
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
- more macOS compilation fixes Still not complete…
2020-01-07 00:11:19 +00:00
if (NOT WIN32)
include_directories(platform/posix)
endif()
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
add_dependencies( ${PROJECT_NAME} revision_check )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# Due to some quirks, we need to do this in this order
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
if( NOT COMPILE_OUTPUT_OLDSTYLE )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# RUNTIME_OUTPUT_DIRECTORY does not exist in CMake 2.4.
# Linux distributions are slow to adopt 2.6. :(
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
set_target_properties( ${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${COMPILE_OUTPUT_DIECTRORY} )
set_target_properties( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME} )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
else()
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
set_target_properties( ${PROJECT_NAME} PROPERTIES
RUNTIME_OUTPUT_NAME ${PROJECT_NAME}
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
RUNTIME_OUTPUT_DIRECTORY_RELEASE ${COMPILE_OUTPUT_DIECTRORY}
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
RUNTIME_OUTPUT_NAME_DEBUG ${PROJECT_NAME}d
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${COMPILE_OUTPUT_DIECTRORY}
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
RUNTIME_OUTPUT_NAME_MINSIZEREL ${PROJECT_NAME}msr
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${COMPILE_OUTPUT_DIECTRORY}
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
RUNTIME_OUTPUT_NAME_RELWITHDEBINFO ${PROJECT_NAME}rd
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${COMPILE_OUTPUT_DIECTRORY}
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
)
endif()
if( MSVC )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
option( COMPILE_GENERATE_MAPFILE "Generate .map file for debugging." OFF )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( LINKERSTUFF "/MANIFEST:NO" )
- renamed internal CMake variables to not contain the project name.
2019-12-27 12:37:39 +00:00
if( COMPILE_GENERATE_MAPFILE )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
set( LINKERSTUFF "${LINKERSTUFF} /MAP" )
endif()
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${LINKERSTUFF})
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\common\\platform\\win32\\manifest.xml\" -outputresource:\"$<TARGET_FILE:${PROJECT_NAME}>\"\;\#1
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
COMMENT "Adding manifest..."
)
endif()
if( NOT WIN32 AND NOT APPLE )
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/link-make "if [ ! -e ${COMPILE_OUTPUT_DIECTRORY}/${PROJECT_NAME} ]; then ln -sf ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} ${COMPILE_OUTPUT_DIECTRORY}/${PROJECT_NAME}; fi" )
add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make
COMMAND /bin/sh -c ${CMAKE_CURRENT_BINARY_DIR}/link-make )
endif()
- added default soundfont Using SC-55 Presets from https://www.vogons.org/viewtopic.php?f=9&t=45600 https://forum.zdoom.org/viewtopic.php?t=67284
2020-02-07 20:36:37 +00:00
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/soundfont/${PROJECT_NAME}.sf2 $<TARGET_FILE_DIR:${PROJECT_NAME}>/soundfonts/${PROJECT_NAME}.sf2
)
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if( CMAKE_COMPILER_IS_GNUCXX )
# GCC misoptimizes this file
endif()
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
# Need to enable intrinsics for these files.
if( SSE_MATTERS )
set_property( SOURCE
common/rendering/polyrenderer/poly_all.cpp
rendering/swrenderer/r_all.cpp
utility/palette.cpp
utility/x86.cpp
APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
endif()
endif()
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
if( APPLE )
set( LINK_FRAMEWORKS "-framework Cocoa -framework IOKit -framework OpenGL")
if( HAVE_VULKAN )
set( LINK_FRAMEWORKS "${LINK_FRAMEWORKS} -framework QuartzCore" )
endif()
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
set_target_properties(${PROJECT_NAME} PROPERTIES
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
LINK_FLAGS "${LINK_FRAMEWORKS}"
- disabled mandatory code signing by Xcode
2020-01-26 14:38:13 +00:00
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/platform/posix/osx/${PROJECT_NAME}-info.plist"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
# Dymanic libraries like libvulkan.dylib or libMoltenVK.dylib will be loaded by dlopen()
# if placed in the directory with the main executable
set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rpath @executable_path" )
endif()
if( WIN32 )
- Exhumed menu tweaks - draw a background and caption for the option menus the game originally did not have. - fixed a crash in the 2D drawer when two consecutively allocated vertex buffers had the same address. Strangely this only occured with Exhumed but not the other games - fixed Exhumed crashing with sound disabled.
2019-12-26 16:42:45 +00:00
set( INSTALL_PATH . CACHE STRING "Directory where the executable will be placed during install." )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
else()
- Exhumed menu tweaks - draw a background and caption for the option menus the game originally did not have. - fixed a crash in the 2D drawer when two consecutively allocated vertex buffers had the same address. Strangely this only occured with Exhumed but not the other games - fixed Exhumed crashing with sound disabled.
2019-12-26 16:42:45 +00:00
set( INSTALL_PATH bin CACHE STRING "Directory where the executable will be placed during install." )
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
endif()
- put the project's name into a variable so that it doesn't have to be changed everywhere if needed.
2019-12-27 12:52:15 +00:00
install(TARGETS ${PROJECT_NAME}
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
DESTINATION ${INSTALL_PATH}
COMPONENT "Game executable")
- renamed 'common' to 'core'. We'll need 'common' for something else.
2020-04-11 21:38:30 +00:00
source_group("Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/utility/.+")
source_group("Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/.+")
source_group("Core\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/textures/.+")
source_group("Core\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/textures/formats/.+")
source_group("Core\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/utility/.+")
source_group("Core\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/2d/.+")
source_group("Core\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/console/.+")
source_group("Core\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/dobject/.+")
source_group("Core\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/menu/.+")
- Exhumed menu tweaks - draw a background and caption for the option menus the game originally did not have. - fixed a crash in the 2D drawer when two consecutively allocated vertex buffers had the same address. Strangely this only occured with Exhumed but not the other games - fixed Exhumed crashing with sound disabled.
2019-12-26 16:42:45 +00:00
source_group("Platform" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/.+")
source_group("Platform\\Win32" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/win32/.+")
- added POSIX source files to generated projects
2020-01-26 14:40:43 +00:00
source_group("Platform\\POSIX" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/posix/.+")
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
source_group("Common" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/.+")
- moved music code to "common"
2020-04-12 06:08:31 +00:00
source_group("Common\\Audio" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/.+")
- moved sound code to "common".
2020-04-12 06:19:19 +00:00
source_group("Common\\Audio\\Sound" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/sound/.+")
source_group("Common\\Audio\\Sound\\Third-party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/sound/thirdparty/.+")
- moved music code to "common"
2020-04-12 06:08:31 +00:00
source_group("Common\\Audio\\Music" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/music.+")
- match with GZDoom's console code, move to 'common'.
2020-04-11 22:11:50 +00:00
source_group("Common\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/console/.+")
source_group("Common\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/utility/.+")
source_group("Common\\Engine" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/engine/.+")
- use GZDoom's 2D drawer. Console and menu font colors are not ok yet, aside from that it works.
2020-05-25 15:11:32 +00:00
source_group("Common\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/2d/.+")
- added DObject as a preparation for the ZScript compiler. Currently large parts are disabled because the backing features are not present yet. # Conflicts: # source/CMakeLists.txt
2020-04-06 14:10:54 +00:00
source_group("Common\\Objects" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/objects/.+")
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
source_group("Common\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/menu/.+")
- added DObject as a preparation for the ZScript compiler. Currently large parts are disabled because the backing features are not present yet. # Conflicts: # source/CMakeLists.txt
2020-04-06 14:10:54 +00:00
source_group("Common\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/fonts/.+")
- match with GZDoom's console code, move to 'common'.
2020-04-11 22:11:50 +00:00
source_group("Common\\File System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/filesystem/.+")
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
source_group("Common\\Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/.+")
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
source_group("Common\\Scripting\\Interface" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/interface/.+")
- added the script compiler's front end.
2020-04-07 22:19:49 +00:00
source_group("Common\\Scripting\\Frontend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/frontend/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h)
- integrated ZScript backend
2020-04-07 18:14:24 +00:00
source_group("Common\\Scripting\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/backend/.+")
- added a first bunch of ZScript code. # Conflicts: # source/CMakeLists.txt # source/common/utility/basics.h # source/core/serializer.h
2020-04-06 19:10:07 +00:00
source_group("Common\\Scripting\\Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/core/.+")
source_group("Common\\Scripting\\JIT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/jit/.+")
- update "common" subfolder. # Conflicts: # source/CMakeLists.txt
2020-04-07 16:04:35 +00:00
source_group("Common\\Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/vm/.+")
- moved platform backend code to 'common'.
2020-04-23 20:58:02 +00:00
source_group("Common\\Platforms\\Cocoa Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/posix/cocoa/.+")
source_group("Common\\Platforms\\OS X Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/posix/osx/.+")
source_group("Common\\Platforms\\Unix Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/posix/unix/.+")
source_group("Common\\Platforms\\SDL Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/posix/sdl/.+")
source_group("Common\\Platforms\\Win32 Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/win32/.+")
- added the softpoly and Vulkan backend code fron GZDoom. Not hooked up yet.
2020-05-31 08:53:11 +00:00
source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/.+")
source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/.+")
source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+")
source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+")
source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+")
source_group("Common\\Rendering\\OpenGL Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/system/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/renderer/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/shaders/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/textures/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/thirdparty/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Third Party\\Volk" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/thirdparty/volk/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Third Party\\Vk_Mem_Alloc" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/thirdparty/vk_mem_alloc.+")
source_group("Common\\Rendering\\Poly Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/polyrenderer/.+")
source_group("Common\\Rendering\\Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/polyrenderer/drawers/.+")
source_group("Common\\Rendering\\Poly Renderer\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/polyrenderer/backend/.+")
- backend update with GZDoom model code.
2020-05-30 22:01:00 +00:00
source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+")
- update "common" subfolder. # Conflicts: # source/CMakeLists.txt
2020-04-07 16:04:35 +00:00
source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+")
- finally managed to merge in the original texture system commit. Game compiles and runs but transparency doesn't work yet. # Conflicts: # source/CMakeLists.txt # source/core/menu/menu.cpp # source/core/textures/buildtiles.cpp
2020-05-24 19:19:33 +00:00
source_group("Common\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/.+")
source_group("Common\\Textures\\Hires\\HQ Resize" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/hqnx/.+")
source_group("Common\\Textures\\Hires\\HQ Resize MMX version" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/hqnx_asm/.+")
source_group("Common\\Textures\\Hires\\XBRZ" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/xbr/.+")
source_group("Common\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/formats/.+")
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
source_group("Common\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/.+")
source_group("Common\\Third Party\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/math/.+")
source_group("Common\\Third Party\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/rapidjson/.+")
source_group("Common\\Third Party\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/sfmt/.+")
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
source_group("Utility\\Smackerdec" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/smackerdec/.+")
source_group("Utility\\Smackerdec\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/libsmackerdec/include/.+")
source_group("Utility\\Smackerdec\\Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/libsmackerdec/src/.+")
source_group("Utility\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/.+")
source_group("Utility\\Third Party Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/include/.+")
source_group("Utility\\Third Party Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/src/.+")
- hooked up GZDoom's JSON serializer. It's time to build a better savegame format and also to replace SJSON with something easier to work with.
2020-02-22 17:41:24 +00:00
source_group("Utility\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/rapidjson/.+")
- transitioned project to CMake and deleted most of the old build system. The EDuke32 and RedNukem frontends are working, Blood isn't yet. Notes: many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works. support code for Windows XP has been entirely removed. On Windows this will only target Vista and up. the crc32.h header had to be renamed to deconflict from zlib. several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way. removed some remaining editor files and support for the native software rendering only Windows backend. in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
2019-09-22 21:15:46 +00:00
source_group("Build Engine" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/build/.+")
source_group("Build Engine\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/build/include/.+")
source_group("Build Engine\\Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/build/src/.+")
- streamlined CMake configuration of game libraries https://forum.zdoom.org/viewtopic.php?t=67121
2020-01-27 11:45:19 +00:00
macro( add_game_library )
file( GLOB HEADER_FILES src/*.h )
if( NOT_COMPILED_SOURCE_FILES )
set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE )
endif()
use_precompiled_header("..")
add_library( ${ARGV0} STATIC
${PCH_SOURCES}
${HEADER_FILES}
${NOT_COMPILED_SOURCE_FILES}
)
endmacro()
- prepare the branch for adding new commits # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:35:03 +00:00
macro( add_game_library2 )
file( GLOB HEADER_FILES src/*.h )
if( NOT_COMPILED_SOURCE_FILES )
set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE )
endif()
use_precompiled_header("../..")
add_library( ${ARGV0} STATIC
${PCH_SOURCES}
${HEADER_FILES}
${NOT_COMPILED_SOURCE_FILES}
)
endmacro()
- streamlined CMake configuration of game libraries https://forum.zdoom.org/viewtopic.php?t=67121
2020-01-27 11:45:19 +00:00
require_stricmp()
require_strnicmp()
unset( PCH_SOURCES )
unset( HEADER_FILES )
unset( NOT_COMPILED_SOURCE_FILES )
- moving to the right place.
2020-06-11 07:31:58 +00:00
add_subdirectory( games/duke )
- streamlined CMake configuration of game libraries https://forum.zdoom.org/viewtopic.php?t=67121
2020-01-27 11:45:19 +00:00
add_subdirectory( blood )
add_subdirectory( sw )
add_subdirectory( exhumed )
Reference in a new issue Copy permalink