Finally remove dependancy on X11 library, as no symbols are used from it anyway.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4331 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
045d75a770
commit
f7737ea294
2 changed files with 3 additions and 3 deletions
|
@ -316,7 +316,7 @@ IMAGELDFLAGS ?= -lpng -ljpeg
|
||||||
OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg
|
OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg
|
||||||
|
|
||||||
#BASELDFLAGS=-lm -lz
|
#BASELDFLAGS=-lm -lz
|
||||||
XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext $(IMAGELDFLAGS)
|
XLDFLAGS=$(IMAGELDFLAGS)
|
||||||
|
|
||||||
ifeq ($(FTE_TARGET),vc)
|
ifeq ($(FTE_TARGET),vc)
|
||||||
WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS
|
WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS
|
||||||
|
@ -1372,7 +1372,7 @@ plugins:
|
||||||
|
|
||||||
plugins-rel:
|
plugins-rel:
|
||||||
@if test -e ../plugins/Makefile; \
|
@if test -e ../plugins/Makefile; \
|
||||||
then $(MAKE) native -C ../plugins OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" BASE_CFLAGS="$(BASE_CFLAGS)"; \
|
then $(MAKE) native -C ../plugins OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \
|
||||||
else echo no plugins directory installed; \
|
else echo no plugins directory installed; \
|
||||||
fi
|
fi
|
||||||
plugins-rel:
|
plugins-rel:
|
||||||
|
|
|
@ -1513,7 +1513,7 @@ void Plug_Initialise(qboolean fromgamedir)
|
||||||
if (!fromgamedir)
|
if (!fromgamedir)
|
||||||
{
|
{
|
||||||
FS_NativePath("", FS_BINARYPATH, nat, sizeof(nat));
|
FS_NativePath("", FS_BINARYPATH, nat, sizeof(nat));
|
||||||
Sys_EnumerateFiles(nat, "fteplug_*"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
|
Sys_EnumerateFiles(nat, "fteplug_*"ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
|
||||||
}
|
}
|
||||||
if (fromgamedir)
|
if (fromgamedir)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue