hedgewars: hedgewars/uPhysFSLayer.pas@5e837e6d8f94 (annotated)

7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	1	unit uPhysFSLayer;
8063 06efc1ea6a40 linking phsyfs on osx koda parents: 8062 diff changeset	2
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	3	interface
8077 2ea5cde93abc Fix build unc0rr parents: 8073 diff changeset	4	uses SDLh, LuaPas;
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	5
8558 e96bf10216ef on windows fpc-linking is the funniest of all koda parents: 8540 diff changeset	6	const PhysfsLibName = {$IFDEF PHYSFS_INTERNAL}'libhw_physfs'{$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	7	const PhyslayerLibName = 'libphyslayer';
8073 5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	8
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	{$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	10	{$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	11	{$linklib physlayer}
8800 5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	12
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	13	{statically linking physfs brings IOKit dependency on OSX while unders other
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	14	UNIX configuration divdi3 is not defined (so we add it ourselves)}
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	15	{$IFDEF PHYSFS_INTERNAL}
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	16	{$IFDEF DARWIN}
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	17	{$linkframework IOKit}
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	18	{$ELSE}
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	19	{$linklib stdc++}
5e837e6d8f94 improve physfs static linking, sdl libraries cleanup koda parents: 8714 diff changeset	20	{$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	21	{$ENDIF}
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	22	{$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	23
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	24	procedure initModule;
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	25	procedure freeModule;
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	26
8028 dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	27	type PFSFile = pointer;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	28
8025 07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	29	function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	30	function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
8022 10b3b93c1f56 - Add physfsrwops library unc0rr parents: 7963 diff changeset	31
8028 dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	32	function pfsOpenRead(fname: shortstring): PFSFile;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	33	function pfsClose(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	34
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	35	procedure pfsReadLn(f: PFSFile; var s: shortstring);
8107 ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	36	procedure pfsReadLnA(f: PFSFile; var s: ansistring);
8031 fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	37	function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	38	function pfsEOF(f: PFSFile): boolean;
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	39
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	40	function pfsExists(fname: shortstring): boolean;
8028 dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	41
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 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	43	procedure physfsReaderSetBuffer(buf: pointer); cdecl; external PhyslayerLibName;
8077 2ea5cde93abc Fix build unc0rr parents: 8073 diff changeset	44
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	45	implementation
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	46	uses uUtils, uVariables, sysutils;
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	47
8073 5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	48	function PHYSFS_init(argv0: PChar) : LongInt; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	49	function PHYSFS_deinit() : LongInt; cdecl; external PhysfsLibName;
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	50	function PHYSFSRWOPS_openRead(fname: PChar): PSDL_RWops; 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	51	function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	52
8073 5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	53	function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongInt; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	54	function PHYSFS_openRead(fname: PChar): PFSFile; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	55	function PHYSFS_eof(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	56	function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	57	function PHYSFS_close(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows koda parents: 8067 diff changeset	58	function PHYSFS_exists(fname: PChar): LongBool; cdecl; external PhysfsLibName;
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	59
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	60	procedure hedgewarsMountPackages(); cdecl; external PhyslayerLibName;
8052 845b5ae03841 Mount .hwt files found in Data folder unc0rr parents: 8046 diff changeset	61
8025 07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	62	function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	63	begin
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	64	exit(PHYSFSRWOPS_openRead(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	65	end;
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	66
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	67	function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	68	begin
8025 07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	69	exit(PHYSFSRWOPS_openWrite(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	70	end;
8022 10b3b93c1f56 - Add physfsrwops library unc0rr parents: 7963 diff changeset	71
8028 dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	72	function pfsOpenRead(fname: shortstring): PFSFile;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	73	begin
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	74	exit(PHYSFS_openRead(Str2PChar(fname)));
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	75	end;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	76
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	77	function pfsEOF(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	78	begin
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	79	exit(PHYSFS_eof(f))
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	80	end;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	81
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	82	function pfsClose(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	83	begin
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	84	exit(PHYSFS_close(f))
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	85	end;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	86
8031 fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	87	function pfsExists(fname: shortstring): boolean;
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	88	begin
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	89	exit(PHYSFS_exists(Str2PChar(fname)))
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	90	end;
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	91
8028 dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	92
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	93	procedure pfsReadLn(f: PFSFile; var s: shortstring);
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	94	var c: char;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	95	begin
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	96	s[0]:= #0;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	97
8034 fc032c0f7b23 Implement reader in C ffs unc0rr parents: 8031 diff changeset	98	while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do
8028 dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	99	if (c <> #13) and (s[0] < #255) then
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	100	begin
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	101	inc(s[0]);
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	102	s[byte(s[0])]:= c
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	103	end
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	104	end;
dc30104660d3 Engine loads fine with basic config unc0rr parents: 8025 diff changeset	105
8107 ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	106	procedure pfsReadLnA(f: PFSFile; var s: ansistring);
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	107	var c: char;
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	108	b: shortstring;
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	109	begin
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	110	s:= '';
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	111	b[0]:= #0;
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	112
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	113	while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	114	if (c <> #13) then
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	115	begin
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	116	inc(b[0]);
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	117	b[byte(b[0])]:= c;
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	118	if b[0] = #255 then
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	119	begin
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	120	s:= s + b;
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	121	b[0]:= #0
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	122	end
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	123	end;
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	124
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	125	s:= s + b
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	126	end;
ee21b816394f Bring ansistrings back unc0rr parents: 8080 diff changeset	127
8031 fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	128	function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	129	var r: Int64;
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	130	begin
8034 fc032c0f7b23 Implement reader in C ffs unc0rr parents: 8031 diff changeset	131	r:= PHYSFS_readBytes(f, buf, size);
8031 fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	132
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	133	if r <= 0 then
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	134	pfsBlockRead:= 0
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	135	else
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	136	pfsBlockRead:= r
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	137	end;
fc40b343c45c Script loading via physfs which doesn't work: unc0rr parents: 8028 diff changeset	138
8025 07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	139	procedure initModule;
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	140	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	141	cPhysfsId: shortstring;
8025 07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	142	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	143	{$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	144	//TODO: http://icculus.org/pipermail/physfs/2011-August/001006.html
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	145	cPhysfsId:= GetCurrentDir() + {$IFDEF DARWIN}'/Hedgewars.app/Contents/MacOS/' + {$ENDIF} ' hedgewars';
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	146	{$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	147	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	148	{$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	149
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	150	i:= PHYSFS_init(Str2PChar(cPhysfsId));
8025 07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	151	AddFileLog('[PhysFS] init: ' + inttostr(i));
07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	152
8714 ab201a62d115 Prepend, not append unc0rr parents: 8558 diff changeset	153	i:= PHYSFS_mount(Str2PChar(PathPrefix), nil, false);
8025 07862ab415c8 Get rid of Pathz and UserPathz unc0rr parents: 8022 diff changeset	154	AddFileLog('[PhysFS] mount ' + PathPrefix + ': ' + inttostr(i));
8714 ab201a62d115 Prepend, not append unc0rr parents: 8558 diff changeset	155	i:= PHYSFS_mount(Str2PChar(UserPathPrefix + '/Data'), nil, false);
8046 4d3415927d2c Use (undocumented) Mix_LoadMUS_RW to load music unc0rr parents: 8034 diff changeset	156	AddFileLog('[PhysFS] mount ' + UserPathPrefix + '/Data: ' + inttostr(i));
8052 845b5ae03841 Mount .hwt files found in Data folder unc0rr parents: 8046 diff changeset	157
845b5ae03841 Mount .hwt files found in Data folder unc0rr parents: 8046 diff changeset	158	hedgewarsMountPackages;
7959 644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	159	end;
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	160
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	161	procedure freeModule;
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	162	begin
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	163	PHYSFS_deinit;
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	164	end;
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	165
644b757d20e6 Start work on physfs support in engine unc0rr parents: diff changeset	166	end.

author	koda
	Tue, 19 Mar 2013 16:18:40 +0100
branch	cmake_pascal
changeset 8800	5e837e6d8f94
parent 8714	ab201a62d115
child 8849	db108c851315
permissions	-rw-r--r--