aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/src/lib/JEDI-SDL
diff options
context:
space:
mode:
Diffstat (limited to 'cmake/src/lib/JEDI-SDL')
-rw-r--r--cmake/src/lib/JEDI-SDL/OpenGL/Pas/glext.pas19
-rw-r--r--cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc8
-rw-r--r--cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas2
-rw-r--r--cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas2
4 files changed, 16 insertions, 15 deletions
diff --git a/cmake/src/lib/JEDI-SDL/OpenGL/Pas/glext.pas b/cmake/src/lib/JEDI-SDL/OpenGL/Pas/glext.pas
index 1fc70f8a..871247a9 100644
--- a/cmake/src/lib/JEDI-SDL/OpenGL/Pas/glext.pas
+++ b/cmake/src/lib/JEDI-SDL/OpenGL/Pas/glext.pas
@@ -4282,32 +4282,33 @@ begin
if (Pos(' ', extension) <> 0) or (extension = '') then
begin
- Result := FALSE;
+ Result := false;
Exit;
end;
if searchIn = '' then
extensions := glGetString(GL_EXTENSIONS)
else
- //StrLCopy( extensions, searchIn, StrLen(searchIn)+1 );
+ //StrLCopy(extensions, searchIn, StrLen(searchIn) + 1);
extensions := searchIn;
start := extensions;
- while TRUE do
+ while true do
begin
- where := StrPos(start, extension );
- if where = nil then Break;
- terminator := Pointer(Integer(where) + Integer( strlen( extension ) ) );
- if (where = start) or (PChar(Integer(where) - 1)^ = ' ') then
+ where := StrPos(start, extension);
+ if where = nil then
+ Break;
+ terminator := where + Length(extension);
+ if (where = start) or ((where - 1)^ = ' ') then
begin
if (terminator^ = ' ') or (terminator^ = #0) then
begin
- Result := TRUE;
+ Result := true;
Exit;
end;
end;
start := terminator;
end;
- Result := FALSE;
+ Result := false;
end;
diff --git a/cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc b/cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
index fed972b5..31817d24 100644
--- a/cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
+++ b/cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
@@ -332,7 +332,7 @@
{$ELSE}
{$DEFINE __OS_DOS__}
{$ENDIF}
- {$IFDEF WIN32}
+ {$IFDEF MSWINDOWS}
{$DEFINE UseWin}
{$ENDIF}
{$DEFINE HAS_TYPES}
@@ -380,13 +380,13 @@
{$OA+} // Objects and structures align
{$ENDIF}
-{$IFDEF Win32}
+{$IFDEF MSWINDOWS}
{$DEFINE OS_BigMem}
-{$ELSE Win32}
+{$ELSE MSWINDOWS}
{$IFDEF ver70}
{$DEFINE assembler}
{$ENDIF} { use 16-bit assembler! }
-{$ENDIF Win32}
+{$ENDIF MSWINDOWS}
{ ************************** dos/dos-like platforms **************}
{$IFDEF Windows}
diff --git a/cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas b/cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
index ea4f220c..796aa0ab 100644
--- a/cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
+++ b/cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
@@ -59,7 +59,7 @@ interface
// each OS gets its own IFDEFed complete code block to make reading easier
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
uses
Windows;
diff --git a/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas b/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
index 0d7e46af..736009c2 100644
--- a/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
+++ b/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
@@ -370,7 +370,7 @@ const
{$IFDEF DARWIN}
SDLLibName = 'libSDL-1.2.0.dylib';
{$linklib libSDL-1.2.0}
- {$linklib gcc}
+// {$linklib gcc}
{$linklib SDLmain}
{$linkframework Cocoa}
{$PASCALMAINNAME SDL_main}