author | sheepluva <sheepluva@users.noreply.github.com> |
Mon, 05 Jan 2015 14:37:08 +0100 | |
changeset 10770 | 8060cb5c2fa6 |
parent 10564 | 0cb20aa8877a |
child 10606 | 8e95911cb86b |
child 11087 | 99578075df24 |
permissions | -rw-r--r-- |
10129
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
1 |
{$INCLUDE "options.inc"} |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
2 |
|
7959 | 3 |
unit uPhysFSLayer; |
8063 | 4 |
|
7959 | 5 |
interface |
8077 | 6 |
uses SDLh, LuaPas; |
7959 | 7 |
|
9204 | 8 |
const PhysfsLibName = {$IFDEF PHYSFS_INTERNAL}'libhwphysfs'{$ELSE}'libphysfs'{$ENDIF}; |
8540
cf808329bb6f
this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents:
8533
diff
changeset
|
9 |
const PhyslayerLibName = 'libphyslayer'; |
8073 | 10 |
|
8540
cf808329bb6f
this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents:
8533
diff
changeset
|
11 |
{$IFNDEF WIN32} |
cf808329bb6f
this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents:
8533
diff
changeset
|
12 |
{$linklib physfs} |
cf808329bb6f
this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents:
8533
diff
changeset
|
13 |
{$linklib physlayer} |
8533
2d7703d6bc22
this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents:
8528
diff
changeset
|
14 |
{$ENDIF} |
2d7703d6bc22
this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents:
8528
diff
changeset
|
15 |
|
7959 | 16 |
procedure initModule; |
17 |
procedure freeModule; |
|
18 |
||
8028 | 19 |
type PFSFile = pointer; |
20 |
||
8025 | 21 |
function rwopsOpenRead(fname: shortstring): PSDL_RWops; |
22 |
function rwopsOpenWrite(fname: shortstring): PSDL_RWops; |
|
8022 | 23 |
|
8028 | 24 |
function pfsOpenRead(fname: shortstring): PFSFile; |
25 |
function pfsClose(f: PFSFile): boolean; |
|
26 |
||
27 |
procedure pfsReadLn(f: PFSFile; var s: shortstring); |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
28 |
procedure pfsReadLnA(f: PFSFile; var s: ansistring); |
8031 | 29 |
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64; |
30 |
function pfsEOF(f: PFSFile): boolean; |
|
31 |
||
32 |
function pfsExists(fname: shortstring): boolean; |
|
8028 | 33 |
|
8533
2d7703d6bc22
this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents:
8528
diff
changeset
|
34 |
function physfsReader(L: Plua_State; f: PFSFile; sz: Psize_t) : PChar; cdecl; external PhyslayerLibName; |
2d7703d6bc22
this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents:
8528
diff
changeset
|
35 |
procedure physfsReaderSetBuffer(buf: pointer); cdecl; external PhyslayerLibName; |
8978
e6ef8fe314bd
suggestion of unc0rr's to fix issue w/ random maps in campaign. load sidecar packages in physfs for lua. should be useful also for lua that does custom layouts
nemo
parents:
8927
diff
changeset
|
36 |
procedure hedgewarsMountPackage(filename: PChar); cdecl; external PhyslayerLibName; |
8077 | 37 |
|
7959 | 38 |
implementation |
10129
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
39 |
uses uConsts, uUtils, uVariables{$IFNDEF PAS2C}, sysutils{$ELSE}, physfs{$ENDIF}; |
7959 | 40 |
|
8839 | 41 |
function PHYSFSRWOPS_openRead(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName; |
8533
2d7703d6bc22
this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents:
8528
diff
changeset
|
42 |
function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName; |
10129
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
43 |
procedure hedgewarsMountPackages(); cdecl; external PhyslayerLibName; |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
44 |
{$IFNDEF PAS2C} |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
45 |
function PHYSFS_init(argv0: PChar): LongInt; cdecl; external PhysfsLibName; |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
46 |
function PHYSFS_deinit(): LongInt; cdecl; external PhysfsLibName; |
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
47 |
function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongBool; cdecl; external PhysfsLibName; |
8073 | 48 |
function PHYSFS_openRead(fname: PChar): PFSFile; cdecl; external PhysfsLibName; |
49 |
function PHYSFS_eof(f: PFSFile): LongBool; cdecl; external PhysfsLibName; |
|
50 |
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName; |
|
51 |
function PHYSFS_close(f: PFSFile): LongBool; cdecl; external PhysfsLibName; |
|
52 |
function PHYSFS_exists(fname: PChar): LongBool; cdecl; external PhysfsLibName; |
|
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
53 |
function PHYSFS_getLastError(): PChar; cdecl; external PhysfsLibName; |
10129
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
54 |
{$ELSE} |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
55 |
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
56 |
begin |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
57 |
PHYSFS_readBytes:= PHYSFS_read(f, buffer, 1, len); |
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
58 |
end; |
10078 | 59 |
{$ENDIF} |
8052 | 60 |
|
8025 | 61 |
function rwopsOpenRead(fname: shortstring): PSDL_RWops; |
62 |
begin |
|
63 |
exit(PHYSFSRWOPS_openRead(Str2PChar(fname))); |
|
64 |
end; |
|
65 |
||
66 |
function rwopsOpenWrite(fname: shortstring): PSDL_RWops; |
|
7959 | 67 |
begin |
8025 | 68 |
exit(PHYSFSRWOPS_openWrite(Str2PChar(fname))); |
69 |
end; |
|
8022 | 70 |
|
8028 | 71 |
function pfsOpenRead(fname: shortstring): PFSFile; |
72 |
begin |
|
73 |
exit(PHYSFS_openRead(Str2PChar(fname))); |
|
74 |
end; |
|
75 |
||
76 |
function pfsEOF(f: PFSFile): boolean; |
|
77 |
begin |
|
78 |
exit(PHYSFS_eof(f)) |
|
79 |
end; |
|
80 |
||
81 |
function pfsClose(f: PFSFile): boolean; |
|
82 |
begin |
|
83 |
exit(PHYSFS_close(f)) |
|
84 |
end; |
|
85 |
||
8031 | 86 |
function pfsExists(fname: shortstring): boolean; |
87 |
begin |
|
88 |
exit(PHYSFS_exists(Str2PChar(fname))) |
|
89 |
end; |
|
90 |
||
8028 | 91 |
|
92 |
procedure pfsReadLn(f: PFSFile; var s: shortstring); |
|
93 |
var c: char; |
|
94 |
begin |
|
95 |
s[0]:= #0; |
|
96 |
||
8034 | 97 |
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do |
8028 | 98 |
if (c <> #13) and (s[0] < #255) then |
99 |
begin |
|
100 |
inc(s[0]); |
|
101 |
s[byte(s[0])]:= c |
|
102 |
end |
|
103 |
end; |
|
104 |
||
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
105 |
procedure pfsReadLnA(f: PFSFile; var s: ansistring); |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
106 |
var c: char; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
107 |
b: shortstring; |
8107 | 108 |
begin |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
109 |
s:= ''; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
110 |
b[0]:= #0; |
8107 | 111 |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
112 |
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
113 |
if (c <> #13) then |
8107 | 114 |
begin |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
115 |
inc(b[0]); |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
116 |
b[byte(b[0])]:= c; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
117 |
if b[0] = #255 then |
8107 | 118 |
begin |
10123 | 119 |
s:= s + ansistring(b); |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10101
diff
changeset
|
120 |
b[0]:= #0 |
8107 | 121 |
end |
122 |
end; |
|
10123 | 123 |
|
124 |
s:= s + ansistring(b) |
|
8107 | 125 |
end; |
126 |
||
8031 | 127 |
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64; |
128 |
var r: Int64; |
|
129 |
begin |
|
8034 | 130 |
r:= PHYSFS_readBytes(f, buf, size); |
8031 | 131 |
|
132 |
if r <= 0 then |
|
133 |
pfsBlockRead:= 0 |
|
134 |
else |
|
135 |
pfsBlockRead:= r |
|
136 |
end; |
|
137 |
||
10127 | 138 |
procedure pfsMount(path: ansistring; mountpoint: PChar); |
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
139 |
begin |
10127 | 140 |
if PHYSFS_mount(PChar(path), mountpoint, false) then |
141 |
AddFileLog('[PhysFS] mount ' + shortstring(path) + ' at ' + shortstring(mountpoint) + ' : ok') |
|
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
142 |
else |
10127 | 143 |
AddFileLog('[PhysFS] mount ' + shortstring(path) + ' at ' + shortstring(mountpoint) + ' : FAILED ("' + shortstring(PHYSFS_getLastError()) + '")'); |
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
144 |
end; |
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
145 |
|
10127 | 146 |
procedure pfsMountAtRoot(path: ansistring); |
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
147 |
begin |
10129
cd2a64a1f4aa
- Pas2C: make use of 'external' function decorator
unc0rr
parents:
10127
diff
changeset
|
148 |
pfsMount(path, PChar(_S'/')); |
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
149 |
end; |
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
150 |
|
8025 | 151 |
procedure initModule; |
152 |
var i: LongInt; |
|
8310
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
153 |
cPhysfsId: shortstring; |
9996 | 154 |
fp: PChar; |
8025 | 155 |
begin |
8310
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
156 |
{$IFDEF HWLIBRARY} |
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
157 |
//TODO: http://icculus.org/pipermail/physfs/2011-August/001006.html |
9378
2be457289e60
update physlayer and sdl bindings to the new rwops interface
koda
parents:
9224
diff
changeset
|
158 |
cPhysfsId:= GetCurrentDir() + {$IFDEF DARWIN}{$IFNDEF IPHONEOS}'/Hedgewars.app/Contents/MacOS/' + {$ENDIF}{$ENDIF} ' hedgewars'; |
8310
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
159 |
{$ELSE} |
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
160 |
cPhysfsId:= ParamStr(0); |
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
161 |
{$ENDIF} |
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
162 |
|
a98c349bc06b
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents:
8283
diff
changeset
|
163 |
i:= PHYSFS_init(Str2PChar(cPhysfsId)); |
8025 | 164 |
AddFileLog('[PhysFS] init: ' + inttostr(i)); |
165 |
||
9994
8455993a7a1b
* allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu'
sheepluva
parents:
9993
diff
changeset
|
166 |
// mount system fonts paths first |
9996 | 167 |
for i:= low(cFontsPaths) to high(cFontsPaths) do |
9994
8455993a7a1b
* allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu'
sheepluva
parents:
9993
diff
changeset
|
168 |
begin |
9996 | 169 |
fp := cFontsPaths[i]; |
170 |
if fp <> nil then |
|
10127 | 171 |
pfsMount(ansistring(fp), PChar('/Fonts')); |
9994
8455993a7a1b
* allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu'
sheepluva
parents:
9993
diff
changeset
|
172 |
end; |
8455993a7a1b
* allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu'
sheepluva
parents:
9993
diff
changeset
|
173 |
|
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
174 |
pfsMountAtRoot(PathPrefix); |
10127 | 175 |
pfsMountAtRoot(UserPathPrefix + ansistring('/Data')); |
8052 | 176 |
|
177 |
hedgewarsMountPackages; |
|
9531
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
178 |
|
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
179 |
// need access to teams and frontend configs (for bindings) |
9993
76ad55807c24
allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents:
9988
diff
changeset
|
180 |
pfsMountAtRoot(UserPathPrefix); |
9988
317d46a2afd2
simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents:
9531
diff
changeset
|
181 |
|
317d46a2afd2
simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents:
9531
diff
changeset
|
182 |
if cTestLua then |
317d46a2afd2
simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents:
9531
diff
changeset
|
183 |
begin |
10564
0cb20aa8877a
more fixing and allow pas2c to run tests. they will still fail though - engine does not exit with the specified exit codes, also data types are messed up
sheepluva
parents:
10129
diff
changeset
|
184 |
pfsMountAtRoot(ansistring(ExtractFileDir(cScriptName))); |
9988
317d46a2afd2
simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents:
9531
diff
changeset
|
185 |
cScriptName := ExtractFileName(cScriptName); |
317d46a2afd2
simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents:
9531
diff
changeset
|
186 |
end; |
7959 | 187 |
end; |
188 |
||
189 |
procedure freeModule; |
|
190 |
begin |
|
191 |
PHYSFS_deinit; |
|
192 |
end; |
|
193 |
||
194 |
end. |