mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-22 20:21:26 +00:00
Cleaned up Windows backend from remains of Direct3D
Removed obsolete CMake settings, useless #include's, dead code
This commit is contained in:
parent
c241f34f15
commit
4ab6034a36
3 changed files with 1 additions and 62 deletions
|
@ -62,21 +62,6 @@ if( WIN32 )
|
||||||
set( DX_dinput8_LIBRARY dinput8 )
|
set( DX_dinput8_LIBRARY dinput8 )
|
||||||
else()
|
else()
|
||||||
|
|
||||||
find_path( D3D_INCLUDE_DIR d3d9.h
|
|
||||||
PATHS ENV DXSDK_DIR
|
|
||||||
PATH_SUFFIXES Include )
|
|
||||||
if( NOT D3D_INCLUDE_DIR )
|
|
||||||
# Modern versions of the Windows SDK include d3d9.h. Unfortunately,
|
|
||||||
# CMake cannot find this file via find_path, so we check for it using
|
|
||||||
# CHECK_INCLUDE_FILE.
|
|
||||||
CHECK_INCLUDE_FILE( d3d9.h D3D9_H_FOUND )
|
|
||||||
if ( NOT D3D9_H_FOUND )
|
|
||||||
message( SEND_ERROR "Could not find DirectX 9 header files" )
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
include_directories( ${D3D_INCLUDE_DIR} )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_path( XINPUT_INCLUDE_DIR xinput.h
|
find_path( XINPUT_INCLUDE_DIR xinput.h
|
||||||
PATHS ENV DXSDK_DIR
|
PATHS ENV DXSDK_DIR
|
||||||
PATH_SUFFIXES Include )
|
PATH_SUFFIXES Include )
|
||||||
|
@ -1285,9 +1270,6 @@ set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${ZD_F
|
||||||
set_source_files_properties( xlat/parse_xlat.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c" )
|
set_source_files_properties( xlat/parse_xlat.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c" )
|
||||||
set_source_files_properties( sc_man.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h" )
|
set_source_files_properties( sc_man.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h" )
|
||||||
set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE )
|
set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE )
|
||||||
if ( WIN32 )
|
|
||||||
set_source_files_properties( win32/fb_d3d9.cpp win32/fb_d3d9_wipe.cpp PROPERTIES COMPILE_FLAGS ${ZD_FASTMATH_FLAG} )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
||||||
|
|
|
@ -367,17 +367,11 @@ static inline double ListGetDouble(Va_List &tags)
|
||||||
return va_arg(tags.list, double);
|
return va_arg(tags.list, double);
|
||||||
}
|
}
|
||||||
|
|
||||||
// These two options are only being used by the D3D version of the HUD weapon drawer, they serve no purpose anywhere else.
|
|
||||||
static inline FSpecialColormap * ListGetSpecialColormap(Va_List &tags)
|
static inline FSpecialColormap * ListGetSpecialColormap(Va_List &tags)
|
||||||
{
|
{
|
||||||
return va_arg(tags.list, FSpecialColormap *);
|
return va_arg(tags.list, FSpecialColormap *);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline FColormapStyle * ListGetColormapStyle(Va_List &tags)
|
|
||||||
{
|
|
||||||
return va_arg(tags.list, FColormapStyle *);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ListEnd(VMVa_List &tags)
|
static void ListEnd(VMVa_List &tags)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -411,12 +405,6 @@ static inline FSpecialColormap * ListGetSpecialColormap(VMVa_List &tags)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline FColormapStyle * ListGetColormapStyle(VMVa_List &tags)
|
|
||||||
{
|
|
||||||
ThrowAbortException(X_OTHER, "Invalid tag in draw function");
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
//
|
//
|
||||||
// Main taglist parsing
|
// Main taglist parsing
|
||||||
|
|
|
@ -32,46 +32,15 @@
|
||||||
**
|
**
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef _DEBUG
|
|
||||||
#define D3D_DEBUG_INFO
|
|
||||||
#endif
|
|
||||||
#define DIRECTDRAW_VERSION 0x0300
|
|
||||||
#define DIRECT3D_VERSION 0x0900
|
|
||||||
|
|
||||||
#define _WIN32_WINNT 0x0501
|
#define _WIN32_WINNT 0x0501
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <mmsystem.h>
|
#include <mmsystem.h>
|
||||||
#include <ddraw.h>
|
|
||||||
#include <d3d9.h>
|
|
||||||
|
|
||||||
// HEADER FILES ------------------------------------------------------------
|
// HEADER FILES ------------------------------------------------------------
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#include "c_cvars.h"
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
#include <ddraw.h>
|
|
||||||
#include <d3d9.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
|
|
||||||
#include "doomtype.h"
|
|
||||||
|
|
||||||
#include "c_dispatch.h"
|
|
||||||
#include "templates.h"
|
|
||||||
#include "i_system.h"
|
#include "i_system.h"
|
||||||
#include "i_video.h"
|
|
||||||
#include "v_video.h"
|
|
||||||
#include "v_pfx.h"
|
|
||||||
#include "stats.h"
|
|
||||||
#include "doomerrors.h"
|
|
||||||
#include "m_argv.h"
|
|
||||||
#include "r_defs.h"
|
|
||||||
#include "v_text.h"
|
|
||||||
#include "version.h"
|
|
||||||
|
|
||||||
|
|
||||||
#include "optwin32.h"
|
|
||||||
|
|
||||||
// MACROS ------------------------------------------------------------------
|
// MACROS ------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue