From ea4c906b37fcfd1d95cd0225670d350bd6e0bfec Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 23 Feb 2023 22:53:10 +0100 Subject: [PATCH 01/19] Add link to SDL2-for-Pascal repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4a571e4..42ce2cb4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Unit files for building [Free Pascal](https://freepascal.org/) / [Delphi](https://www.embarcadero.com/products/delphi) applications using the [SDL2 library](https://libsdl.org). -This repository is a community-maintained fork of the [Pascal-SDL-2-Headers](https://github.com/ev1313/Pascal-SDL-2-Headers) repo. +The [SDL2-for-Pascal](https://github.com/PascalGameDevelopment/SDL2-for-Pascal) repository is a community-maintained fork of the [Pascal-SDL-2-Headers](https://github.com/ev1313/Pascal-SDL-2-Headers) repository. ## Installation From f55700be46fedacf9f02687a96e005a136b644fe Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 23 Feb 2023 23:53:46 +0100 Subject: [PATCH 02/19] Add doc link --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 42ce2cb4..864f4516 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,10 @@ Use the `sdl2` unit for the main SDL2 library (should be always needed). Units f - [`sdl2_net`](https://www.libsdl.org/projects/SDL_net/) - [`sdl2_ttf`](https://www.libsdl.org/projects/SDL_ttf/) +## Documentation + +[Official SDL2-for-Pascal Documentation](https://pascalgamedevelopment.github.io/SDL2-for-Pascal) + ## Bugs / Contributions / ToDos If you have any contributions or bugfixes, feel free to drop a pull request or send in a patch. From 3a3d5b045005e23e6871c7de1baf0ee2e8a7f065 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 23 Feb 2023 23:57:41 +0100 Subject: [PATCH 03/19] Add links for further resources on Pascal/SDL2 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 864f4516..903ee633 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ Use the `sdl2` unit for the main SDL2 library (should be always needed). Units f [Official SDL2-for-Pascal Documentation](https://pascalgamedevelopment.github.io/SDL2-for-Pascal) +### Further Resources + +[Free Pascal meets SDL](https://www.freepascal-meets-sdl.net) +[PGD SDL2 Forum](https://www.pascalgamedevelopment.com/forumdisplay.php?26-SDL-SDL-2) + ## Bugs / Contributions / ToDos If you have any contributions or bugfixes, feel free to drop a pull request or send in a patch. From 9dd3e2171e1427e23b8e84fa4e47ebfe0cc5d700 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 24 Feb 2023 00:00:48 +0100 Subject: [PATCH 04/19] Move Code style guidelines one level down (below contributions) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 903ee633..7901eea1 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ See part Enums on the [Cheat sheet](CHEATSHEET.md) for reference. - (Continously) improve Delphi-compatibility (and even more important, DO NOT break it) - (Continously) Adapt comments to [PasDoc format](https://pasdoc.github.io). (See issue [#22](https://github.com/PascalGameDevelopment/SDL2-for-Pascal/issues/22)) -## Code style guidelines +### Code style guidelines The main principle is to stay as tight as possible at the names in the C headers. These guidelines aim to have better consistency in this community project and make From 16c3e5cd3bc204033ce6cc663b0c5c63d4964cfa Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 24 Feb 2023 00:04:52 +0100 Subject: [PATCH 05/19] Add link to issues --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7901eea1..94b55012 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ Use the `sdl2` unit for the main SDL2 library (should be always needed). Units f ## Bugs / Contributions / ToDos If you have any contributions or bugfixes, feel free to drop a pull request or send in a patch. +Please use the GitHub [issue tracker](https://github.com/PascalGameDevelopment/SDL2-for-Pascal/issues). -Please use the GitHub issue tracker for bug reports. ### ToDos From 1f9c8a027b0d7e3dfa308f35f6d2b74a2fa92443 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 24 Feb 2023 00:09:10 +0100 Subject: [PATCH 06/19] Update copyright --- units/sdl2.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 5bcdc070..6c0acbb9 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -8,7 +8,7 @@ Copyright (C) 2012-2020 Tim Blume aka End/EV1313 SDL2-for-Pascal - Copyright (C) 2020-2021 PGD Community + Copyright (C) 2020-2023 PGD Community SDL.pas is based on the files: "sdl.h", From c192f267fecff7da36d508ba7c04539d1bf937f8 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 24 Feb 2023 00:14:43 +0100 Subject: [PATCH 07/19] Update SDL.pas-comment --- units/sdl2.pas | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 6c0acbb9..2e49b866 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -10,44 +10,9 @@ SDL2-for-Pascal Copyright (C) 2020-2023 PGD Community - SDL.pas is based on the files: - "sdl.h", - "sdl_audio.h", - "sdl_blendmode.h", - "sdl_clipboard.h", - "sdl_cpuinfo.h", - "sdl_events.h", - "sdl_error.h", - "sdl_filesystem.h", - "sdl_gamecontroller.h", - "sdl_gesture.h", - "sdl_haptic.h", - "sdl_hints.h", - "sdl_joystick.h", - "sdl_keyboard.h", - "sdl_keycode.h", - "sdl_loadso.h", - "sdl_log.h", - "sdl_pixels.h", - "sdl_power.h", - "sdl_main.h", - "sdl_messagebox.h", - "sdl_mouse.h", - "sdl_mutex.h", - "sdl_rect.h", - "sdl_render.h", - "sdl_rwops.h", - "sdl_scancode.h", - "sdl_shape.h", - "sdl_stdinc.h", - "sdl_surface.h", - "sdl_system.h", - "sdl_syswm.h", - "sdl_thread.h", - "sdl_timer.h", - "sdl_touch.h", - "sdl_version.h", - "sdl_video.h" + sdl2.pas is based on the C header files in the include folder + of the original Simple DirectMedia Layer repository. + See: https://github.com/libsdl-org/SDL I will not translate: "sdl_opengl.h", From 0d0392f83e08585b6fd4d4a63128a79f301eaa05 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 24 Feb 2023 00:21:53 +0100 Subject: [PATCH 08/19] Update OpenGL comment --- units/sdl2.pas | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 2e49b866..3aabe8f3 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -14,16 +14,13 @@ of the original Simple DirectMedia Layer repository. See: https://github.com/libsdl-org/SDL - I will not translate: + OpenGL header files are not translated: "sdl_opengl.h", "sdl_opengles.h" "sdl_opengles2.h" - cause there's a much better OpenGL-Header avaible at delphigl.com: - - the dglopengl.pas - - You'll find it nowadays here: https://github.com/SaschaWillems/dglOpenGL + There is a much better OpenGL-Header avaible at delphigl.com: dglopengl.pas + See: https://github.com/SaschaWillems/dglOpenGL Parts of the SDL.pas are from the SDL-1.2-Headerconversion from the JEDI-Team, written by Domenique Louis and others. From 7abf5a78b00551028143696cc4a8da69f64589fb Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 24 Feb 2023 00:25:47 +0100 Subject: [PATCH 09/19] Update copyright --- units/sdl2.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 3aabe8f3..b10175d5 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -2,7 +2,7 @@ { Simple DirectMedia Layer - Copyright (C) 1997-2013 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Pascal-Header-Conversion Copyright (C) 2012-2020 Tim Blume aka End/EV1313 From c68be74707acdb2aa1434b14245f4bbb6e4c745f Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 02:25:31 +0100 Subject: [PATCH 10/19] add maintainers --- units/sdl2.pas | 1 + 1 file changed, 1 insertion(+) diff --git a/units/sdl2.pas b/units/sdl2.pas index b10175d5..b9cd9d1f 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -9,6 +9,7 @@ SDL2-for-Pascal Copyright (C) 2020-2023 PGD Community + Maintainers: M. J. Molski and Super Vegeta (aka suve) sdl2.pas is based on the C header files in the include folder of the original Simple DirectMedia Layer repository. From c9da43850cb23568a18320dd6c514ea7021f186f Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 02:30:55 +0100 Subject: [PATCH 11/19] add special thanks entry --- units/sdl2.pas | 1 + 1 file changed, 1 insertion(+) diff --git a/units/sdl2.pas b/units/sdl2.pas index b9cd9d1f..93ad1bad 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -47,6 +47,7 @@ Special Thanks to: + - Tim Blume and everyone else contributing to the "Pascal-Header-Conversion" - DelphiGL.com - Community - Domenique Louis and everyone else from the JEDI-Team - Sam Latinga and everyone else from the SDL-Team From dea63ea843afb90130d477849e4c425ccae71cf8 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 02:51:52 +0100 Subject: [PATCH 12/19] Remove outdated comment --- units/sdl2.pas | 3 --- 1 file changed, 3 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 93ad1bad..06d01ef2 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -26,9 +26,6 @@ Parts of the SDL.pas are from the SDL-1.2-Headerconversion from the JEDI-Team, written by Domenique Louis and others. - I've changed the names of the dll for 32 & 64-Bit, so theres no conflict - between 32 & 64 bit Libraries. - This software is provided 'as-is', without any express or implied warranty. In no case will the authors be held liable for any damages arising from the use of this software. From ccdc944d441388ec29f9f4f64691e0a7125a0c23 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 03:07:03 +0100 Subject: [PATCH 13/19] Add new unit header --- units/sdl2.pas | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 06d01ef2..f08979c4 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -1,16 +1,20 @@ unit sdl2; { + SDL2-for-Pascal + ================= + Pascal units for SDL2 - Simple Direct Media Layer, Version 2 + + Copyright (C) 2020-2023 PGD Community + Maintainers: M. J. Molski and Super Vegeta (aka suve) + Visit: https://github.com/PascalGameDevelopment/SDL2-for-Pascal + Simple DirectMedia Layer Copyright (C) 1997-2023 Sam Lantinga Pascal-Header-Conversion Copyright (C) 2012-2020 Tim Blume aka End/EV1313 - SDL2-for-Pascal - Copyright (C) 2020-2023 PGD Community - Maintainers: M. J. Molski and Super Vegeta (aka suve) - sdl2.pas is based on the C header files in the include folder of the original Simple DirectMedia Layer repository. See: https://github.com/libsdl-org/SDL From 2c9a05176b1e9d07d6b93bc2273d0f8b2902b263 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 03:30:42 +0100 Subject: [PATCH 14/19] Update head comment --- units/sdl2.pas | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index f08979c4..a9f7895b 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -3,7 +3,7 @@ { SDL2-for-Pascal ================= - Pascal units for SDL2 - Simple Direct Media Layer, Version 2 + Pascal units for SDL2 - Simple Direct MediaLayer, Version 2 Copyright (C) 2020-2023 PGD Community Maintainers: M. J. Molski and Super Vegeta (aka suve) @@ -11,9 +11,12 @@ Simple DirectMedia Layer Copyright (C) 1997-2023 Sam Lantinga + Visit: http://libsdl.org - Pascal-Header-Conversion - Copyright (C) 2012-2020 Tim Blume aka End/EV1313 + SDL2-for-Pascal is based upon: + + Pascal-Header-Conversion + Copyright (C) 2012-2020 Tim Blume aka End/EV1313 sdl2.pas is based on the C header files in the include folder of the original Simple DirectMedia Layer repository. From a53a3752af4ec602a3d87e4ff617c3439fce4fdf Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 03:52:34 +0100 Subject: [PATCH 15/19] Update head comment (clearify credits) --- units/jedi.inc | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/units/jedi.inc b/units/jedi.inc index 0f443fcb..0fe85a20 100644 --- a/units/jedi.inc +++ b/units/jedi.inc @@ -1,22 +1,15 @@ { - Simple DirectMedia Layer - Copyright (C) 1997-2013 Sam Lantinga + This file (jedi.inc) is part of SDL2-for-Pascal. + It defines some variables for several Pascal-Compilers and OS-versions. - Pascal-Header-Conversion - Copyright (c) 2012/13 Tim Blume aka End + It is based upon: - sdl.inc is based on the files: - "begin_code.h", - "close_code.h", - "sdl_config.h", - "sdl_config_windows.h", - ... - it defines some variables for several Pascal-Compilers and OS-versions. + Pascal-Header-Conversion + Copyright (c) 2012/13 Tim Blume aka End - It is based on mine updated version of jedi-sdl.inc from the SDL 1.2 Headers, - they can be found at delphigl.com or on my github-repository: - - https://github.com/ev1313/ + jedi-sdl.inc: Global Conditional Definitions for JEDI-SDL cross-compilation + Copyright (C) 2000 - 2013 Prof. Abimbola Olowofoyeku and Tim Blume + See: https://github.com/ev1313/ This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages From 5581a30ce81ff61e4f5ea2f351869207076fcd2a Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 03:54:48 +0100 Subject: [PATCH 16/19] Move changelog from jedi.inc into legacychangelog.md --- LEGACYCHANGELOG.md | 8 ++++++++ units/jedi.inc | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LEGACYCHANGELOG.md b/LEGACYCHANGELOG.md index cdfee2cd..3f7d27ce 100644 --- a/LEGACYCHANGELOG.md +++ b/LEGACYCHANGELOG.md @@ -83,3 +83,11 @@ v.1.70-stable; 16.09.2013: Initial Commit v.1.72-stable; 29.09.2013: fixed bug with procedures without parameters (they must have brackets) v.1.70-stable; 11.09.2013: Initial Commit + +## Extracted from jedi.inc + +v. 1.63-stable; 16.09.13: since GPC isn't supported anymore, i've deleted it from here, too. + +v. 1.22-alpha; 24.07.13: fixed some bugs. special thanks to kotai from pascalgamedevelopment.com + +v. 1.00-alpha; 05.07.13: Initial Alpha-Release diff --git a/units/jedi.inc b/units/jedi.inc index 0fe85a20..0e305e70 100644 --- a/units/jedi.inc +++ b/units/jedi.inc @@ -28,14 +28,6 @@ 3. This notice may not be removed or altered from any source distribution. } -{ - Changelog: - ---------- - v. 1.63-stable; 16.09.13: since GPC isn't supported anymore, i've deleted it from here, too. - v. 1.22-alpha; 24.07.13: fixed some bugs. special thanks to kotai from pascalgamedevelopment.com - v. 1.00-alpha; 05.07.13: Initial Alpha-Release -} - {.$define Debug} { uncomment for debugging } {$IFNDEF FPC} From e04084d190f8f44d7d3329e47127d759430dd73c Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 04:27:25 +0100 Subject: [PATCH 17/19] Unify credit style --- units/sdl2.pas | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index a9f7895b..19a53111 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -18,6 +18,9 @@ Pascal-Header-Conversion Copyright (C) 2012-2020 Tim Blume aka End/EV1313 + JEDI-SDL : Pascal units for SDL + Copyright (C) 2000 - 2004 Dominique Louis + sdl2.pas is based on the C header files in the include folder of the original Simple DirectMedia Layer repository. See: https://github.com/libsdl-org/SDL @@ -30,9 +33,6 @@ There is a much better OpenGL-Header avaible at delphigl.com: dglopengl.pas See: https://github.com/SaschaWillems/dglOpenGL - Parts of the SDL.pas are from the SDL-1.2-Headerconversion from the JEDI-Team, - written by Domenique Louis and others. - This software is provided 'as-is', without any express or implied warranty. In no case will the authors be held liable for any damages arising from the use of this software. From cf910032b0c33db83cd8c31f3b3218f65126aefa Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 25 Feb 2023 04:32:56 +0100 Subject: [PATCH 18/19] add missing line break --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 94b55012..a954001d 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ Use the `sdl2` unit for the main SDL2 library (should be always needed). Units f ### Further Resources [Free Pascal meets SDL](https://www.freepascal-meets-sdl.net) + [PGD SDL2 Forum](https://www.pascalgamedevelopment.com/forumdisplay.php?26-SDL-SDL-2) ## Bugs / Contributions / ToDos From 6294d5fbaf9bfdbe39101eab25f6fc1445fe2396 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 6 Apr 2023 15:37:36 +0200 Subject: [PATCH 19/19] Update maintainers credits --- units/sdl2.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 19a53111..8cfabf45 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -6,7 +6,7 @@ Pascal units for SDL2 - Simple Direct MediaLayer, Version 2 Copyright (C) 2020-2023 PGD Community - Maintainers: M. J. Molski and Super Vegeta (aka suve) + Maintainers: M. J. Molski and suve Visit: https://github.com/PascalGameDevelopment/SDL2-for-Pascal Simple DirectMedia Layer