Skip to content

Commit 047221c

Browse files
PascalCorpsmanPascalCorpsman
committed
FIX: SDL_DYNAMIC_LINKING -> SDL_RUNTIME_LOADING
1 parent a5e0478 commit 047221c

36 files changed

+558
-558
lines changed

‎units/sdl.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const
4141
* Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
4242
* signal handlers for some commonly ignored fatal signals (like SIGSEGV).
4343
*}
44-
{$ifdef SDL_DYNAMIC_LINKING}
44+
{$ifdef SDL_RUNTIME_LOADING}
4545
Type
4646
TSDL_Init_fun = function(flags: TSDL_Init): cint; cdecl;
4747
Var
@@ -55,7 +55,7 @@ function SDL_Init(flags: TSDL_Init): cint; cdecl;
5555
{**
5656
* This function initializes specific SDL subsystems
5757
*}
58-
{$ifdef SDL_DYNAMIC_LINKING}
58+
{$ifdef SDL_RUNTIME_LOADING}
5959
Type
6060
TSDL_InitSubSystem_fun = function(flags: TSDL_Init): cint; cdecl;
6161
Var
@@ -69,7 +69,7 @@ function SDL_InitSubSystem(flags: TSDL_Init): cint; cdecl;
6969
{**
7070
* This function cleans up specific SDL subsystems
7171
*}
72-
{$ifdef SDL_DYNAMIC_LINKING}
72+
{$ifdef SDL_RUNTIME_LOADING}
7373
Type
7474
TSDL_QuitSubSystem_proc = procedure(flags: TSDL_Init); cdecl;
7575
Var
@@ -86,7 +86,7 @@ procedure SDL_QuitSubSystem(flags: TSDL_Init); cdecl;
8686
*
8787
* If flags is 0, it returns a mask of all initialized subsystems.
8888
*}
89-
{$ifdef SDL_DYNAMIC_LINKING}
89+
{$ifdef SDL_RUNTIME_LOADING}
9090
Type
9191
TSDL_WasInit_fun = function(flags: TSDL_Init): cuint32; cdecl;
9292
Var
@@ -101,7 +101,7 @@ function SDL_WasInit(flags: TSDL_Init): cuint32; cdecl;
101101
* This function cleans up all initialized subsystems. You should
102102
* call it upon all exit conditions.
103103
*}
104-
{$ifdef SDL_DYNAMIC_LINKING}
104+
{$ifdef SDL_RUNTIME_LOADING}
105105
Type
106106
TSDL_Quit_proc = procedure(); cdecl;
107107
Var

‎units/sdl2.pas

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
* Not all functions are "ported" yet, so use is on own risk
7575
* port missing functions.
7676
*}
77-
{.$DEFINE SDL_DYNAMIC_LINKING}
77+
{.$DEFINE SDL_RUNTIME_LOADING}
7878
7979
* ---------- End content of file ----------
8080
*
@@ -193,7 +193,7 @@ interface
193193
{$I sdlsystem.inc} // 2.24.0
194194
{$I sdl.inc} // 2.0.14
195195

196-
{$ifdef SDL_DYNAMIC_LINKING}
196+
{$ifdef SDL_RUNTIME_LOADING}
197197
Function SDL_LoadLib(LibFilename: String): Boolean;
198198
Procedure SDL_UnLoadLib();
199199
{$endif}
@@ -212,7 +212,7 @@ implementation
212212
{$ELSE}
213213
AnsiStrings
214214
{$ENDIF}
215-
{$ifdef SDL_DYNAMIC_LINKING}
215+
{$ifdef SDL_RUNTIME_LOADING}
216216
, dynlibs
217217
{$endif}
218218
;
@@ -515,7 +515,7 @@ function SDL_GameControllerAddMappingsFromFile(const FilePath: PAnsiChar
515515
end;
516516

517517

518-
{$IFDEF SDL_DYNAMIC_LINKING}
518+
{$IFDEF SDL_RUNTIME_LOADING}
519519

520520
Finalization
521521
SDL_UnLoadLib();

‎units/sdl_dnymic_linking.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
{$IFDEF SDL_DYNAMIC_LINKING}
2+
{$IFDEF SDL_RUNTIME_LOADING}
33

44
Var
55
LibHandle: TLibHandle = 0;

‎units/sdlaudio.inc

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ function SDL_GetNumAudioDrivers: cint; cdecl;
242242
*
243243
* \sa SDL_GetNumAudioDrivers
244244
*}
245-
{$ifdef SDL_DYNAMIC_LINKING}
245+
{$ifdef SDL_RUNTIME_LOADING}
246246
Type
247247
TSDL_GetAudioDriver_fun = function(index: cint): PAnsiChar; cdecl;
248248
Var
@@ -276,7 +276,7 @@ function SDL_GetAudioDriver(index: cint): PAnsiChar; cdecl;
276276
*
277277
* \sa SDL_AudioQuit
278278
*}
279-
{$ifdef SDL_DYNAMIC_LINKING}
279+
{$ifdef SDL_RUNTIME_LOADING}
280280
Type
281281
TSDL_AudioInit_fun = function(driver_name: PAnsiChar): cint; cdecl;
282282
Var
@@ -368,7 +368,7 @@ function SDL_GetCurrentAudioDriver: PAnsiChar; cdecl;
368368
* \sa SDL_PauseAudio
369369
* \sa SDL_UnlockAudio
370370
*}
371-
{$ifdef SDL_DYNAMIC_LINKING}
371+
{$ifdef SDL_RUNTIME_LOADING}
372372
Type
373373
TSDL_OpenAudio_fun = function(desired: PSDL_AudioSpec; obtained: PSDL_AudioSpec): cint; cdecl;
374374
Var
@@ -437,7 +437,7 @@ type
437437
* \sa SDL_GetAudioDeviceName
438438
* \sa SDL_OpenAudioDevice
439439
*}
440-
{$ifdef SDL_DYNAMIC_LINKING}
440+
{$ifdef SDL_RUNTIME_LOADING}
441441
Type
442442
TSDL_GetNumAudioDevices_fun = function(iscapture: cint): cint; cdecl;
443443
Var
@@ -473,7 +473,7 @@ function SDL_GetNumAudioDevices(iscapture: cint): cint; cdecl;
473473
* \sa SDL_GetNumAudioDevices
474474
* \sa SDL_GetDefaultAudioInfo
475475
*}
476-
{$ifdef SDL_DYNAMIC_LINKING}
476+
{$ifdef SDL_RUNTIME_LOADING}
477477
Type
478478
TSDL_GetAudioDeviceName_fun = function(index: cint; iscapture: cint): PAnsiChar; cdecl;
479479
Var
@@ -507,7 +507,7 @@ function SDL_GetAudioDeviceName(index: cint; iscapture: cint): PAnsiChar; cdecl;
507507
* \sa SDL_GetNumAudioDevices
508508
* \sa SDL_GetDefaultAudioInfo
509509
}
510-
{$ifdef SDL_DYNAMIC_LINKING}
510+
{$ifdef SDL_RUNTIME_LOADING}
511511
Type
512512
TSDL_GetAudioDeviceSpec_fun = function(index: cint; iscapture: cint; spec: PSDL_AudioSpec): cint; cdecl;
513513
Var
@@ -548,7 +548,7 @@ function SDL_GetAudioDeviceSpec(index: cint; iscapture: cint; spec: PSDL_AudioSp
548548
* \sa SDL_GetAudioDeviceSpec
549549
* \sa SDL_OpenAudioDevice
550550
}
551-
{$ifdef SDL_DYNAMIC_LINKING}
551+
{$ifdef SDL_RUNTIME_LOADING}
552552
Type
553553
TSDL_GetDefaultAudioInfo_fun = function(name: PPAnsiChar; spec: PSDL_AudioSpec; iscapture: cint): cint; cdecl;
554554
Var
@@ -670,7 +670,7 @@ function SDL_GetDefaultAudioInfo(name: PPAnsiChar; spec: PSDL_AudioSpec; iscaptu
670670
* \sa SDL_PauseAudioDevice
671671
* \sa SDL_UnlockAudioDevice
672672
*}
673-
{$ifdef SDL_DYNAMIC_LINKING}
673+
{$ifdef SDL_RUNTIME_LOADING}
674674
Type
675675
TSDL_OpenAudioDevice_fun = function(device: PAnsiChar;
676676
iscapture: cint;
@@ -737,7 +737,7 @@ function SDL_GetAudioStatus: TSDL_AudioStatus; cdecl;
737737
*
738738
* \sa SDL_PauseAudioDevice
739739
*}
740-
{$ifdef SDL_DYNAMIC_LINKING}
740+
{$ifdef SDL_RUNTIME_LOADING}
741741
Type
742742
TSDL_GetAudioDeviceStatus_fun = function(dev: TSDL_AudioDeviceID): TSDL_AudioStatus; cdecl;
743743
Var
@@ -779,7 +779,7 @@ function SDL_GetAudioDeviceStatus(dev: TSDL_AudioDeviceID): TSDL_AudioStatus; cd
779779
* \sa SDL_GetAudioStatus
780780
* \sa SDL_PauseAudioDevice
781781
*}
782-
{$ifdef SDL_DYNAMIC_LINKING}
782+
{$ifdef SDL_RUNTIME_LOADING}
783783
Type
784784
TSDL_PauseAudio_proc = procedure(pause_on: cint); cdecl;
785785
Var
@@ -818,7 +818,7 @@ procedure SDL_PauseAudio(pause_on: cint); cdecl;
818818
*
819819
* \sa SDL_LockAudioDevice
820820
*}
821-
{$ifdef SDL_DYNAMIC_LINKING}
821+
{$ifdef SDL_RUNTIME_LOADING}
822822
Type
823823
TSDL_PauseAudioDevice_proc = procedure(dev: TSDL_AudioDeviceID; pause_on: cint); cdecl;
824824
Var
@@ -912,7 +912,7 @@ procedure SDL_PauseAudioDevice(dev: TSDL_AudioDeviceID; pause_on: cint); cdecl;
912912
* \sa SDL_FreeWAV
913913
* \sa SDL_LoadWAV
914914
*}
915-
{$ifdef SDL_DYNAMIC_LINKING}
915+
{$ifdef SDL_RUNTIME_LOADING}
916916
Type
917917
TSDL_LoadWAV_RW_fun = function(src: PSDL_RWops;
918918
freesrc: cint;
@@ -952,7 +952,7 @@ function SDL_LoadWAV(file_: PAnsiChar; spec: PSDL_AudioSpec; audio_buf: ppcuint8
952952
* \sa SDL_LoadWAV
953953
* \sa SDL_LoadWAV_RW
954954
*}
955-
{$ifdef SDL_DYNAMIC_LINKING}
955+
{$ifdef SDL_RUNTIME_LOADING}
956956
Type
957957
TSDL_FreeWAV_proc = procedure(audio_buf: pcuint8); cdecl;
958958
Var
@@ -995,7 +995,7 @@ procedure SDL_FreeWAV(audio_buf: pcuint8); cdecl;
995995
*
996996
* \sa SDL_ConvertAudio
997997
*}
998-
{$ifdef SDL_DYNAMIC_LINKING}
998+
{$ifdef SDL_RUNTIME_LOADING}
999999
Type
10001000
TSDL_BuildAudioCVT_fun = function(cvt: PSDL_AudioCVT;
10011001
src_format: TSDL_AudioFormat;
@@ -1056,7 +1056,7 @@ function SDL_BuildAudioCVT(cvt: PSDL_AudioCVT;
10561056
*
10571057
* \sa SDL_BuildAudioCVT
10581058
*}
1059-
{$ifdef SDL_DYNAMIC_LINKING}
1059+
{$ifdef SDL_RUNTIME_LOADING}
10601060
Type
10611061
TSDL_ConvertAudio_fun = function(cvt: PSDL_AudioCVT): cint; cdecl;
10621062
Var
@@ -1098,7 +1098,7 @@ type
10981098
* \sa SDL_AudioStreamClear
10991099
* \sa SDL_FreeAudioStream
11001100
}
1101-
{$ifdef SDL_DYNAMIC_LINKING}
1101+
{$ifdef SDL_RUNTIME_LOADING}
11021102
Type
11031103
TSDL_NewAudioStream_fun = function(src_format: TSDL_AudioFormat; src_channels: cuint8; src_rate: cint; dst_format: TSDL_AudioFormat; dst_channels: cuint8;
11041104
dst_rate: cint): PSDL_AudioStream; cdecl;
@@ -1128,7 +1128,7 @@ function SDL_NewAudioStream(src_format: TSDL_AudioFormat; src_channels: cuint8;
11281128
* \sa SDL_AudioStreamClear
11291129
* \sa SDL_FreeAudioStream
11301130
}
1131-
{$ifdef SDL_DYNAMIC_LINKING}
1131+
{$ifdef SDL_RUNTIME_LOADING}
11321132
Type
11331133
TSDL_AudioStreamPut_fun = function(stream: PSDL_AudioStream; buf: pointer; len: cint): cint; cdecl;
11341134
Var
@@ -1156,7 +1156,7 @@ function SDL_AudioStreamPut(stream: PSDL_AudioStream; buf: pointer; len: cint):
11561156
* \sa SDL_AudioStreamClear
11571157
* \sa SDL_FreeAudioStream
11581158
}
1159-
{$ifdef SDL_DYNAMIC_LINKING}
1159+
{$ifdef SDL_RUNTIME_LOADING}
11601160
Type
11611161
TSDL_AudioStreamGet_fun = function(stream: PSDL_AudioStream; buf: pointer; len: cint): cint; cdecl;
11621162
Var
@@ -1183,7 +1183,7 @@ function SDL_AudioStreamGet(stream: PSDL_AudioStream; buf: pointer; len: cint):
11831183
* \sa SDL_AudioStreamClear
11841184
* \sa SDL_FreeAudioStream
11851185
}
1186-
{$ifdef SDL_DYNAMIC_LINKING}
1186+
{$ifdef SDL_RUNTIME_LOADING}
11871187
Type
11881188
TSDL_AudioStreamAvailable_fun = function(stream: PSDL_AudioStream): cint; cdecl;
11891189
Var
@@ -1211,7 +1211,7 @@ function SDL_AudioStreamAvailable(stream: PSDL_AudioStream): cint; cdecl;
12111211
* \sa SDL_AudioStreamClear
12121212
* \sa SDL_FreeAudioStream
12131213
}
1214-
{$ifdef SDL_DYNAMIC_LINKING}
1214+
{$ifdef SDL_RUNTIME_LOADING}
12151215
Type
12161216
TSDL_AudioStreamFlush_fun = function(stream: PSDL_AudioStream): cint; cdecl;
12171217
Var
@@ -1234,7 +1234,7 @@ function SDL_AudioStreamFlush(stream: PSDL_AudioStream): cint; cdecl;
12341234
* \sa SDL_AudioStreamFlush
12351235
* \sa SDL_FreeAudioStream
12361236
}
1237-
{$ifdef SDL_DYNAMIC_LINKING}
1237+
{$ifdef SDL_RUNTIME_LOADING}
12381238
Type
12391239
TSDL_AudioStreamClear_proc = procedure(stream: PSDL_AudioStream); cdecl;
12401240
Var
@@ -1257,7 +1257,7 @@ procedure SDL_AudioStreamClear(stream: PSDL_AudioStream); cdecl;
12571257
* \sa SDL_AudioStreamFlush
12581258
* \sa SDL_AudioStreamClear
12591259
}
1260-
{$ifdef SDL_DYNAMIC_LINKING}
1260+
{$ifdef SDL_RUNTIME_LOADING}
12611261
Type
12621262
TSDL_FreeAudioStream_proc = procedure(stream: PSDL_AudioStream); cdecl;
12631263
Var
@@ -1293,7 +1293,7 @@ const
12931293
*
12941294
* \sa SDL_MixAudioFormat
12951295
*}
1296-
{$ifdef SDL_DYNAMIC_LINKING}
1296+
{$ifdef SDL_RUNTIME_LOADING}
12971297
Type
12981298
TSDL_MixAudio_proc = procedure(dst: pcuint8; src: pcuint8; len: cuint32; volume: cint); cdecl;
12991299
Var
@@ -1334,7 +1334,7 @@ procedure SDL_MixAudio(dst: pcuint8; src: pcuint8; len: cuint32; volume: cint);
13341334
*
13351335
* \since This function is available since SDL 2.0.0.
13361336
*}
1337-
{$ifdef SDL_DYNAMIC_LINKING}
1337+
{$ifdef SDL_RUNTIME_LOADING}
13381338
Type
13391339
TSDL_MixAudioFormat_proc = procedure(dst: pcuint8; src: pcuint8; format: TSDL_AudioFormat; len: cuint32; volume: cint); cdecl;
13401340
Var
@@ -1391,7 +1391,7 @@ procedure SDL_MixAudioFormat(dst: pcuint8; src: pcuint8; format: TSDL_AudioForma
13911391
* \sa SDL_ClearQueuedAudio
13921392
* \sa SDL_GetQueuedAudioSize
13931393
*}
1394-
{$ifdef SDL_DYNAMIC_LINKING}
1394+
{$ifdef SDL_RUNTIME_LOADING}
13951395
Type
13961396
TSDL_QueueAudio_fun = function(dev: TSDL_AudioDeviceID; data: Pointer; len: cuint32): cint; cdecl;
13971397
Var
@@ -1448,7 +1448,7 @@ function SDL_QueueAudio(dev: TSDL_AudioDeviceID; data: Pointer; len: cuint32): c
14481448
* \sa SDL_ClearQueuedAudio
14491449
* \sa SDL_GetQueuedAudioSize
14501450
*}
1451-
{$ifdef SDL_DYNAMIC_LINKING}
1451+
{$ifdef SDL_RUNTIME_LOADING}
14521452
Type
14531453
TSDL_DequeueAudio_fun = function(dev: TSDL_AudioDeviceID; data: Pointer; len: cuint32): cuint32; cdecl;
14541454
Var
@@ -1491,7 +1491,7 @@ function SDL_DequeueAudio(dev: TSDL_AudioDeviceID; data: Pointer; len: cuint32):
14911491
* \sa SDL_QueueAudio
14921492
* \sa SDL_DequeueAudio
14931493
*}
1494-
{$ifdef SDL_DYNAMIC_LINKING}
1494+
{$ifdef SDL_RUNTIME_LOADING}
14951495
Type
14961496
TSDL_GetQueuedAudioSize_fun = function(dev: TSDL_AudioDeviceID): cuint32; cdecl;
14971497
Var
@@ -1534,7 +1534,7 @@ function SDL_GetQueuedAudioSize(dev: TSDL_AudioDeviceID): cuint32; cdecl;
15341534
* \sa SDL_QueueAudio
15351535
* \sa SDL_DequeueAudio
15361536
*}
1537-
{$ifdef SDL_DYNAMIC_LINKING}
1537+
{$ifdef SDL_RUNTIME_LOADING}
15381538
Type
15391539
TSDL_ClearQueuedAudio_proc = procedure(dev: TSDL_AudioDeviceID); cdecl;
15401540
Var
@@ -1612,7 +1612,7 @@ procedure SDL_LockAudio; cdecl;
16121612
*
16131613
* \sa SDL_UnlockAudioDevice
16141614
*}
1615-
{$ifdef SDL_DYNAMIC_LINKING}
1615+
{$ifdef SDL_RUNTIME_LOADING}
16161616
Type
16171617
TSDL_LockAudioDevice_proc = procedure(dev: TSDL_AudioDeviceID); cdecl;
16181618
Var
@@ -1655,7 +1655,7 @@ procedure SDL_UnlockAudio; cdecl;
16551655
*
16561656
* \sa SDL_LockAudioDevice
16571657
*}
1658-
{$ifdef SDL_DYNAMIC_LINKING}
1658+
{$ifdef SDL_RUNTIME_LOADING}
16591659
Type
16601660
TSDL_UnlockAudioDevice_proc = procedure(dev: TSDL_AudioDeviceID); cdecl;
16611661
Var
@@ -1708,7 +1708,7 @@ procedure SDL_CloseAudio; cdecl;
17081708
*
17091709
* \sa SDL_OpenAudioDevice
17101710
*}
1711-
{$ifdef SDL_DYNAMIC_LINKING}
1711+
{$ifdef SDL_RUNTIME_LOADING}
17121712
Type
17131713
TSDL_CloseAudioDevice_proc = procedure(dev: TSDL_AudioDeviceID); cdecl;
17141714
Var

‎units/sdlblendmode.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const
7878
* and
7979
* dstA = dstA * dstAlphaFactor alphaOperation srcA * srcAlphaFactor
8080
*}
81-
{$ifdef SDL_DYNAMIC_LINKING}
81+
{$ifdef SDL_RUNTIME_LOADING}
8282
Type
8383
TSDL_ComposeCustomBlendMode_fun = function(srcColorFactor, dstColorFactor: TSDL_BlendFactor; colorOperation: TSDL_BlendOperation; srcAlphaFactor, dstAlphaFactor: TSDL_BlendFactor; alphaOperation: TSDL_BlendOperation): TSDL_BlendMode; cdecl;
8484
Var

0 commit comments

Comments
 (0)