Skip to content

Commit cd47f78

Browse files
committed
Revert "Refactor DirectX specific code into its own class, like OpenGL"
This reverts commit 5d23755.
1 parent 5d23755 commit cd47f78

File tree

13 files changed

+490
-751
lines changed

13 files changed

+490
-751
lines changed

BuildConfig.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,14 @@
2727

2828

2929
//
30-
// Enable the use of OpenGL display driver
30+
// Enable the use of OpenGL display driver, otherwise use DirectX.
3131
//
3232
#ifndef _LEGACY_VCC
3333
#ifndef USE_OPENGL
3434
#define USE_OPENGL true
3535
#endif
3636
#endif
3737

38-
//
39-
// Enable the use of DirectX display driver
40-
//
41-
#ifndef USE_DIRECTX
42-
#define USE_DIRECTX true
43-
#endif
44-
4538
//
4639
// Enable black fill to preserve aspect ratio, otherwise replicate border color.
4740
//
@@ -91,6 +84,13 @@
9184
//
9285
// Edit options above rather than these:
9386
//
87+
#if !USE_OPENGL
88+
#define USE_DIRECTX true
89+
#endif
90+
91+
#if USE_OPENGL && USE_DIRECTX
92+
#error Enable either USE_OPENGL or USE_DIRECTX not both.
93+
#endif
9494

9595
///////////////////////////////////////////////////////////////////////////////////////////////////
9696
// Options that are always off for release

0 commit comments

Comments
 (0)