Skip to content

Commit 2b4c11d

Browse files
Merge pull request #27 from Free-Pascal-meets-SDL-Website/folderstructure
Add "units", "docs", "examples", "tests" folder Move all unit and inc files into units folders. Hint: You need to update the unit source for your Pascal projects! This closes issue #22 . Check it for more information on this PR.
2 parents 535b241 + 00caef4 commit 2b4c11d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+996
-979
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
- name: Checkout code
1818
uses: actions/checkout@v2
1919
- name: Compile SDL2 unit
20-
run: fpc sdl2.pas
20+
run: fpc units/sdl2.pas
2121
- name: Compile SDL2_gfx unit
22-
run: fpc sdl2_gfx.pas
22+
run: fpc units/sdl2_gfx.pas
2323
- name: Compile SDL2_image unit
24-
run: fpc sdl2_image.pas
24+
run: fpc units/sdl2_image.pas
2525
- name: Compile SDL2_mixer unit
26-
run: fpc sdl2_mixer.pas
26+
run: fpc units/sdl2_mixer.pas
2727
- name: Compile SDL2_net unit
28-
run: fpc sdl2_net.pas
28+
run: fpc units/sdl2_net.pas
2929
- name: Compile SDL2_ttf unit
30-
run: fpc sdl2_ttf.pas
30+
run: fpc units/sdl2_ttf.pas
3131
ubuntu-20-04:
3232
runs-on: ubuntu-20.04
3333
steps:
@@ -39,17 +39,17 @@ jobs:
3939
- name: Checkout code
4040
uses: actions/checkout@v2
4141
- name: Compile SDL2 unit
42-
run: fpc sdl2.pas
42+
run: fpc units/sdl2.pas
4343
- name: Compile SDL2_gfx unit
44-
run: fpc sdl2_gfx.pas
44+
run: fpc units/sdl2_gfx.pas
4545
- name: Compile SDL2_image unit
46-
run: fpc sdl2_image.pas
46+
run: fpc units/sdl2_image.pas
4747
- name: Compile SDL2_mixer unit
48-
run: fpc sdl2_mixer.pas
48+
run: fpc units/sdl2_mixer.pas
4949
- name: Compile SDL2_net unit
50-
run: fpc sdl2_net.pas
50+
run: fpc units/sdl2_net.pas
5151
- name: Compile SDL2_ttf unit
52-
run: fpc sdl2_ttf.pas
52+
run: fpc units/sdl2_ttf.pas
5353
windows-2022:
5454
runs-on: windows-2022
5555
steps:
@@ -59,15 +59,15 @@ jobs:
5959
- name: Checkout code
6060
uses: actions/checkout@v2
6161
- name: Compile SDL2 unit
62-
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe sdl2.pas
62+
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe units/sdl2.pas
6363
- name: Compile SDL2_gfx unit
64-
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe sdl2_gfx.pas
64+
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe units/sdl2_gfx.pas
6565
- name: Compile SDL2_image unit
66-
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe sdl2_image.pas
66+
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe units/sdl2_image.pas
6767
- name: Compile SDL2_mixer unit
68-
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe sdl2_mixer.pas
68+
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe units/sdl2_mixer.pas
6969
- name: Compile SDL2_net unit
70-
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe sdl2_net.pas
70+
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe units/sdl2_net.pas
7171
- name: Compile SDL2_ttf unit
72-
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe sdl2_ttf.pas
72+
run: C:/lazarus/fpc/*/bin/x86_64-win64/fpc.exe units/sdl2_ttf.pas
7373

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ Win64/*
2929
compile/*
3030
*.~inc
3131
backup/*
32+
*/backup
33+
*/*/backup
3234
*.res

docs/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Docs folder
2+
3+
See issue #22.
4+
5+
Delete this file if the first doc has been added.

examples/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SDL2/Pascal examples folder
2+
3+
See issue #22.
4+
5+
Delete this file if the first example program has been added.

tests/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Tests folder
2+
3+
See issue #22.
4+
5+
Delete this file if the first test has been added.

jedi.inc renamed to units/jedi.inc

File renamed without changes.

sdl.inc renamed to units/sdl.inc

File renamed without changes.

sdl2.pas renamed to units/sdl2.pas

File renamed without changes.

0 commit comments

Comments
 (0)