From c85d8973f64bc9c17d5233ee70b8000f1b3578bf Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Thu, 29 Dec 2022 19:48:15 +0300 Subject: [PATCH] build: move dependency check to modules where they used --- src/flexui/fui_events.pas | 4 ++++ src/flexui/sdlcarcass.pas | 4 ++++ src/flexui/sdlstandalone.pas | 4 ++++ src/game/renders/opengl/r_fui_gfx_gl.pas | 4 ++++ src/game/renders/opengl/r_holmes.pas | 4 ++++ src/shared/a_modes.inc | 21 --------------------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/flexui/fui_events.pas b/src/flexui/fui_events.pas index b5785b7..836ec14 100644 --- a/src/flexui/fui_events.pas +++ b/src/flexui/fui_events.pas @@ -16,6 +16,10 @@ {$INCLUDE ../shared/a_modes.inc} unit fui_events; + {$IFNDEF USE_SDL2} + {$FATAL SDL2 required for flexui fui_events} + {$ENDIF} + interface uses diff --git a/src/flexui/sdlcarcass.pas b/src/flexui/sdlcarcass.pas index edbf2d1..20363e6 100644 --- a/src/flexui/sdlcarcass.pas +++ b/src/flexui/sdlcarcass.pas @@ -15,6 +15,10 @@ {$INCLUDE ../shared/a_modes.inc} unit sdlcarcass; + {$IFNDEF USE_SDL2} + {$FATAL SDL2 required for flexui sdlcarcass} + {$ENDIF} + interface uses diff --git a/src/flexui/sdlstandalone.pas b/src/flexui/sdlstandalone.pas index 6b6dd8a..79506da 100644 --- a/src/flexui/sdlstandalone.pas +++ b/src/flexui/sdlstandalone.pas @@ -15,6 +15,10 @@ {$INCLUDE ../shared/a_modes.inc} unit sdlstandalone; + {$IFNDEF USE_SDL2} + {$FATAL SDL2 required for flexui sdlstandalone} + {$ENDIF} + interface uses diff --git a/src/game/renders/opengl/r_fui_gfx_gl.pas b/src/game/renders/opengl/r_fui_gfx_gl.pas index f64171a..b4ab11b 100644 --- a/src/game/renders/opengl/r_fui_gfx_gl.pas +++ b/src/game/renders/opengl/r_fui_gfx_gl.pas @@ -17,6 +17,10 @@ {$DEFINE FUI_TEXT_ICONS} unit r_fui_gfx_gl; + {$IFDEF USE_GLES1} + {$FATAL Desktop OpenGL required for current flexui implementation} + {$ENDIF} + interface uses diff --git a/src/game/renders/opengl/r_holmes.pas b/src/game/renders/opengl/r_holmes.pas index 1a370d5..f83fa6d 100644 --- a/src/game/renders/opengl/r_holmes.pas +++ b/src/game/renders/opengl/r_holmes.pas @@ -15,6 +15,10 @@ {$INCLUDE ../../../shared/a_modes.inc} unit r_holmes; + {$IFDEF USE_GLES1} + {$FATAL Desktop OpenGL required for current Holmes implementation} + {$ENDIF} + interface procedure r_Holmes_Draw (); diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc index 831214a..fd14633 100644 --- a/src/shared/a_modes.inc +++ b/src/shared/a_modes.inc @@ -307,24 +307,3 @@ {$UNDEF USE_OPENGL} {$UNDEF USE_STUBRENDER} {$ENDIF} - -{$IFDEF ENABLE_HOLMES} - {$IFDEF DISABLE_SYSTEM} - {$FATAL System driver required for current Holmes implementation} - {$ENDIF} - {$IFDEF DISABLE_RENDER} - {$FATAL Render driver required for current Holmes implementation} - {$ENDIF} - {$IFNDEF USE_SDL2} - {$FATAL SDL2 required for current Holmes implementation} - {$ENDIF} - {$IF NOT DEFINED(USE_OPENGL) AND NOT DEFINED(USE_NEWGL)} - {$FATAL Desktop OpenGL required for current Holmes implementation} - {$ENDIF} -{$ENDIF} - -{$IFDEF ENABLE_TOUCH} - {$IFDEF DISABLE_SYSTEM} - {$FATAL System driver required for current touch implementation} - {$ENDIF} -{$ENDIF} -- 2.29.2