Make sure freetype doesn't use the system/wrong png/zlib headers when compiled statically.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5557 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike
parent
cda3b251af
commit
0558ec638b
4 changed files with 32 additions and 18 deletions
|
|
@ -595,7 +595,7 @@ endif
|
|||
SDL_INCLUDES=
|
||||
#-I$(LIBS_DIR)/sdl/include -I/usr/include/SDL -I$(LIBS_DIR)/sdl/include/SDL
|
||||
BASE_INCLUDES=-I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(GL_DIR) -I$(D3D_DIR) -I$(PROGS_DIR) -I. -I$(LIBS_DIR)
|
||||
BASE_CFLAGS=$(WARNINGFLAGS) $(GNUC_FUNCS) $(BASE_INCLUDES) -I$(LIBS_DIR)/dxsdk9/include -I$(LIBS_DIR)/dxsdk7/include $(SDL_INCLUDES) -I./libs/freetype2/include -I./libs/freetype2/include/freetype $(BOTLIB_CFLAGS) $(SVNREVISION)
|
||||
BASE_CFLAGS=$(WARNINGFLAGS) $(GNUC_FUNCS) $(BASE_INCLUDES) -I$(LIBS_DIR)/dxsdk9/include -I$(LIBS_DIR)/dxsdk7/include $(SDL_INCLUDES) $(BOTLIB_CFLAGS) $(SVNREVISION)
|
||||
CLIENT_ONLY_CFLAGS=-DCLIENTONLY
|
||||
SERVER_ONLY_CFLAGS=-DSERVERONLY
|
||||
JOINT_CFLAGS=
|
||||
|
|
@ -1231,7 +1231,7 @@ ifeq ($(FTE_TARGET),vc)
|
|||
|
||||
LIBS_DIR=./libs/
|
||||
|
||||
BASE_CFLAGS:=$(WARNINGFLAGS) $(GNUC_FUNCS) -I$(shell cygpath -m $(CLIENT_DIR)) -I$(shell cygpath -m $(SERVER_DIR)) -I$(shell cygpath -m $(COMMON_DIR)) -I$(shell cygpath -m $(GL_DIR)) -I$(shell cygpath -m $(D3D_DIR)) -I$(shell cygpath -m $(PROGS_DIR)) -I. -I$(LIBS_DIR) -I$(LIBS_DIR)/dxsdk9/include -I$(LIBS_DIR)/dxsdk7/include $(SDL_INCLUDES) -I./libs/freetype2/include -I./libs/freetype2/include/freetype $(BOTLIB_CFLAGS) $(SVNREVISION)
|
||||
BASE_CFLAGS:=$(WARNINGFLAGS) $(GNUC_FUNCS) -I$(shell cygpath -m $(CLIENT_DIR)) -I$(shell cygpath -m $(SERVER_DIR)) -I$(shell cygpath -m $(COMMON_DIR)) -I$(shell cygpath -m $(GL_DIR)) -I$(shell cygpath -m $(D3D_DIR)) -I$(shell cygpath -m $(PROGS_DIR)) -I. -I$(LIBS_DIR) -I$(LIBS_DIR)/dxsdk9/include -I$(LIBS_DIR)/dxsdk7/include $(SDL_INCLUDES) $(BOTLIB_CFLAGS) $(SVNREVISION)
|
||||
|
||||
SV_CFLAGS=$(SERVER_ONLY_CFLAGS) $(W32_CFLAGS) -DMULTITHREAD -DMSVCLIBPATH=libs/
|
||||
SV_EXE_NAME=../$(EXE_NAME)-sv$(BITS)$(EXEPOSTFIX)
|
||||
|
|
@ -2281,9 +2281,9 @@ libs-$(ARCH)/libspeexdsp.a:
|
|||
test -f speexdsp-$(SPEEXDSPVER).tar.gz || wget http://downloads.xiph.org/releases/speex/speexdsp-$(SPEEXDSPVER).tar.gz
|
||||
-test -f libs-$(ARCH)/libspeexdsp.a || (mkdir -p libs-$(ARCH)/speex && cd libs-$(ARCH) && tar -xvzf ../speexdsp-$(SPEEXDSPVER).tar.gz && cd speexdsp-$(SPEEXDSPVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp libspeexdsp/.libs/libspeexdsp.a ../ && cp -r include/speex/*.h ../speex/)
|
||||
|
||||
libs-$(ARCH)/libfreetype.a:
|
||||
libs-$(ARCH)/libfreetype.a: libs-$(ARCH)/libpng.a
|
||||
test -f freetype-$(FREETYPEVER).tar.gz || wget https://download.savannah.gnu.org/releases/freetype/freetype-$(FREETYPEVER).tar.gz
|
||||
-test -f libs-$(ARCH)/libfreetype.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../freetype-$(FREETYPEVER).tar.gz && cd freetype-$(FREETYPEVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure $(CONFIGARGS) --with-bzip2=no --with-harfbuzz=no && $(TOOLOVERRIDES) $(MAKE) && cp objs/.libs/libfreetype.a ../ && cp -r include/ ../)
|
||||
-test -f libs-$(ARCH)/libfreetype.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../freetype-$(FREETYPEVER).tar.gz && cd freetype-$(FREETYPEVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure CPPFLAGS=-I$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ LDFLAGS=-L$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ $(CONFIGARGS) --with-bzip2=no --with-harfbuzz=no && $(TOOLOVERRIDES) $(MAKE) && cp objs/.libs/libfreetype.a ../ && cp -r include/ ../)
|
||||
|
||||
libs-$(ARCH)/libBulletDynamics.a:
|
||||
test -f bullet3-$(BULLETVER).tar.gz || wget https://github.com/bulletphysics/bullet3/archive/$(BULLETVER).tar.gz -O bullet3-$(BULLETVER).tar.gz
|
||||
|
|
|
|||
|
|
@ -1144,7 +1144,7 @@ void P_ParticleEffect_f(void)
|
|||
if (!ptype->loaded)
|
||||
{
|
||||
if (part_type[parenttype].assoc != P_INVALID)
|
||||
Con_Printf("warning: assoc on particle chain %s overridden\n", var+1);
|
||||
Con_Printf("warning: assoc on particle chain \"%s.%s\" overridden\n", part_type[parenttype].config, part_type[parenttype].name);
|
||||
part_type[parenttype].assoc = ptype - part_type;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4945,11 +4945,22 @@ static void COM_Version_f (void)
|
|||
#endif
|
||||
|
||||
//print out which libraries are disabled
|
||||
#ifndef AVAIL_ZLIB
|
||||
Con_Printf("zlib disabled\n");
|
||||
#else
|
||||
Con_Printf("zlib: %s\n", ZLIB_VERSION);
|
||||
Con_Printf("^3Compression:^7\n");
|
||||
#ifdef AVAIL_ZLIB
|
||||
Con_Printf(" zlib^h("
|
||||
#ifdef ZLIB_STATIC
|
||||
"static, "
|
||||
#endif
|
||||
"%s)^h", ZLIB_VERSION);
|
||||
#endif
|
||||
#ifdef AVAIL_BZLIB
|
||||
Con_Printf(" bzlib"
|
||||
#ifdef BZLIB_STATIC
|
||||
"^h(static)^h"
|
||||
#endif
|
||||
);
|
||||
#endif
|
||||
Con_Printf("\n");
|
||||
|
||||
#ifdef HAVE_CLIENT
|
||||
Image_PrintInputFormatVersions();
|
||||
|
|
|
|||
|
|
@ -826,20 +826,23 @@ static int QDECL COM_Dir_List(const char *name, qofs_t size, time_t mtime, void
|
|||
Q_snprintfz(link, sizeof(link), "\\tip\\Change Map\\map\\%s", name+5);
|
||||
colour = "^4"; //disconnects
|
||||
}
|
||||
#if !defined(NOBUILTINMENUS) && !defined(MINIMAL)
|
||||
else if (!Q_strcasecmp(ext, "bsp") || !Q_strcasecmp(ext, "spr") || !Q_strcasecmp(ext, "mdl") || !Q_strcasecmp(ext, "md3") || !Q_strcasecmp(ext, "iqm") ||
|
||||
!Q_strcasecmp(ext, "vvm") || !Q_strcasecmp(ext, "psk") || !Q_strcasecmp(ext, "dpm") || !Q_strcasecmp(ext, "zym") || !Q_strcasecmp(ext, "md5mesh") ||
|
||||
!Q_strcasecmp(ext, "mdx") || !Q_strcasecmp(ext, "md2") || !Q_strcasecmp(ext, "obj") ||
|
||||
!Q_strcasecmp(ext, "mdx") || !Q_strcasecmp(ext, "md2") || !Q_strcasecmp(ext, "obj") || !Q_strcasecmp(ext, "mds") || !Q_strcasecmp(ext, "mdc") ||
|
||||
!Q_strcasecmp(ext, "md5anim") || !Q_strcasecmp(ext, "gltf") || !Q_strcasecmp(ext, "glb") || !Q_strcasecmp(ext, "ase") || !Q_strcasecmp(ext, "lwo"))
|
||||
Q_snprintfz(link, sizeof(link), "\\tip\\Open in Model Viewer\\modelviewer\\%s", name);
|
||||
else if (!Q_strcasecmp(ext, "qc") || !Q_strcasecmp(ext, "src") || !Q_strcasecmp(ext, "qh") || !Q_strcasecmp(ext, "h") || !Q_strcasecmp(ext, "c")
|
||||
|| !Q_strcasecmp(ext, "cfg") || !Q_strcasecmp(ext, "rc")
|
||||
|| !Q_strcasecmp(ext, "txt") || !Q_strcasecmp(ext, "log")
|
||||
|| !Q_strcasecmp(ext, "ent") || !Q_strcasecmp(ext, "rtlights")
|
||||
|| !Q_strcasecmp(ext, "glsl") || !Q_strcasecmp(ext, "hlsl")
|
||||
|| !Q_strcasecmp(ext, "shader") || !Q_strcasecmp(ext, "framegroups")
|
||||
|| !Q_strcasecmp(ext, "vmt")
|
||||
)
|
||||
#endif
|
||||
#ifdef TEXTEDITOR
|
||||
else if (!Q_strcasecmp(ext, "qc") || !Q_strcasecmp(ext, "src") || !Q_strcasecmp(ext, "qh") || !Q_strcasecmp(ext, "h") || !Q_strcasecmp(ext, "c") ||
|
||||
!Q_strcasecmp(ext, "cfg") || !Q_strcasecmp(ext, "rc") ||
|
||||
!Q_strcasecmp(ext, "txt") || !Q_strcasecmp(ext, "log") ||
|
||||
!Q_strcasecmp(ext, "ent") || !Q_strcasecmp(ext, "rtlights") ||
|
||||
!Q_strcasecmp(ext, "glsl") || !Q_strcasecmp(ext, "hlsl") ||
|
||||
!Q_strcasecmp(ext, "shader") || !Q_strcasecmp(ext, "framegroups") ||
|
||||
!Q_strcasecmp(ext, "vmt") || !Q_strcasecmp(ext, "skin"))
|
||||
Q_snprintfz(link, sizeof(link), "\\tip\\Open in Text Editor\\edit\\%s", name);
|
||||
#endif
|
||||
else if (!Q_strcasecmp(ext, "tga") || !Q_strcasecmp(ext, "png") || !Q_strcasecmp(ext, "jpg") || !Q_strcasecmp(ext, "jpeg")|| !Q_strcasecmp(ext, "lmp") || !Q_strcasecmp(ext, "ico") ||
|
||||
!Q_strcasecmp(ext, "pcx") || !Q_strcasecmp(ext, "bmp") || !Q_strcasecmp(ext, "dds") || !Q_strcasecmp(ext, "ktx") || !Q_strcasecmp(ext, "vtf") || !Q_strcasecmp(ext, "psd") ||
|
||||
!Q_strcasecmp(ext, "astc")|| !Q_strcasecmp(ext, "htga")|| !Q_strcasecmp(ext, "exr") ||
|
||||
|
|
|
|||
Loading…
Reference in a new issue