ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mac OS X needs Com_Memcpy and Com_Memset to be set to memcpy and memset.

Browse source
This commit is contained in:
Six 2005-10-08 06:30:38 +00:00
parent 29db2dbbfd
commit 8866ce3f8b
3 changed files with 92 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/game/q_shared.h
View file

@ -476,7 +476,7 @@ void *Hunk_AllocDebug( int size, ha_pref preference, char *label, char *file, in
void *Hunk_Alloc( int size, ha_pref preference );
#endif
#if defined(__GNUC__) && !defined(__MINGW32__)
#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(MACOS_X)
// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=371
// custom Snd_Memset implementation for glibc memset bug workaround
void Snd_Memset (void* dest, const int val, const size_t count);

62
code/macosx/Quake3.pbproj/project.pbxproj
View file

@ -136,6 +136,7 @@
13380E3100ADFD58C697A10E,
13380E3200ADFD71C697A10E,
13380E3300ADFD85C697A10E,
4F23A81708F4FA8F00CB90D3,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -257,6 +258,7 @@
13380E4F00AE0112C697A10E,
13380E5000AE020FC697A10E,
13380E5200AE0235C697A10E,
4F23A81B08F4FA8F00CB90D3,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -5003,6 +5005,7 @@
016EAE1500B4BE42C697A10E,
016EAE1600B4BE42C697A10E,
016EAE1700B4BE53C697A10E,
4F23A81908F4FA8F00CB90D3,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -5322,6 +5325,7 @@
0170311600B48B5CC697A10E,
F54951F40354EAA2011BCB42,
4FB23865047AB9F60098ACF3,
4F23A81308F4FA8F00CB90D3,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -6427,9 +6431,9 @@
};
dependencies = (
0170311D00B49352C697A10E,
4FF091EA04897B0000030DA8,
18A3D356065F6636006A719A,
18A3D358065F663A006A719A,
18A3D356065F6636006A719A,
4FF091EA04897B0000030DA8,
18A3D35A065F663F006A719A,
);
isa = PBXAggregateTarget;
@ -6476,6 +6480,7 @@
043627B600868916C697A10E,
043627B700868916C697A10E,
043627B800868916C697A10E,
4F23A81108F4FA8F00CB90D3,
);
isa = PBXGroup;
name = "Mac OS X";
@ -8160,6 +8165,7 @@
016F1B6400ACDA9BC697A10E,
4FB23867047ABF780098ACF3,
4FEFFEDA047B008000719638,
4F23A81D08F4FA8F00CB90D3,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -8809,6 +8815,56 @@
//4F2
//4F3
//4F4
4F23A81108F4FA8F00CB90D3 = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.c;
path = macosx_common.c;
refType = 4;
sourceTree = "<group>";
};
4F23A81308F4FA8F00CB90D3 = {
fileRef = 4F23A81108F4FA8F00CB90D3;
isa = PBXBuildFile;
settings = {
};
};
4F23A81508F4FA8F00CB90D3 = {
fileRef = 4F23A81108F4FA8F00CB90D3;
isa = PBXBuildFile;
settings = {
};
};
4F23A81708F4FA8F00CB90D3 = {
fileRef = 4F23A81108F4FA8F00CB90D3;
isa = PBXBuildFile;
settings = {
};
};
4F23A81908F4FA8F00CB90D3 = {
fileRef = 4F23A81108F4FA8F00CB90D3;
isa = PBXBuildFile;
settings = {
};
};
4F23A81B08F4FA8F00CB90D3 = {
fileRef = 4F23A81108F4FA8F00CB90D3;
isa = PBXBuildFile;
settings = {
};
};
4F23A81D08F4FA8F00CB90D3 = {
fileRef = 4F23A81108F4FA8F00CB90D3;
isa = PBXBuildFile;
settings = {
};
};
4F23A81F08F4FA8F00CB90D3 = {
fileRef = 4F23A81108F4FA8F00CB90D3;
isa = PBXBuildFile;
settings = {
};
};
4FB23863047AB9F60098ACF3 = {
fileEncoding = 30;
isa = PBXFileReference;
@ -9498,6 +9554,7 @@
4FF0911504896C0E00030DA8,
4FF0911B04896C0E00030DA8,
4FF0911C04896C0E00030DA8,
4F23A81508F4FA8F00CB90D3,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -10919,6 +10976,7 @@
4FF091D904896C1600030DA8,
4FF091DD04896C1600030DA8,
4FF091DF04896C1600030DA8,
4F23A81F08F4FA8F00CB90D3,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;

31
code/macosx/macosx_common.c Normal file
View file

@ -0,0 +1,31 @@
/*
===========================================================================
Copyright (C) 1999-2005 Id Software, Inc.
This file is part of Quake III Arena source code.
Quake III Arena source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
Quake III Arena source code is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
#include <unistd.h>
#include <string.h>
void Com_Memcpy (void* dest, const void* src, const size_t count) {
memcpy(dest, src, count);
}
void Com_Memset (void* dest, const int val, const size_t count) {
memset(dest, val, count);
}