quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more compile fail

Browse Source
This commit is contained in:
Rudolf Polzer 2011-07-01 12:18:32 +02:00
parent 114175def3
commit 636baaba0f
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -695,7 +695,6 @@ $(INSTALLDIR)/radiant.$(EXE): \
radiant/xmlstuff.o \
radiant/xywindow.o \
libcmdlib.$(A) \
libfilematch.$(A) \
libgtkutil.$(A) \
libl_net.$(A) \
libmathlib.$(A) \
@ -863,6 +862,7 @@ $(INSTALLDIR)/modules/vfspk3.$(DLL): \
plugins/vfspk3/archive.o \
plugins/vfspk3/vfs.o \
plugins/vfspk3/vfspk3.o \
libfilematch.$(A) \
$(INSTALLDIR)/plugins/bobtoolz.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK)
$(INSTALLDIR)/plugins/bobtoolz.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude

9
libs/filematch.h
View File

@ -1,7 +1,16 @@
#if !defined(INCLUDED_FILEMATCH_H)
#define INCLUDED_FILEMATCH_H
#ifdef __cplusplus
extern "C"
{
#endif
int matchpattern(const char *in, const char *pattern, int caseinsensitive);
int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, int wildcard_least_one);
#ifdef __cplusplus
}
#endif
#endif

3
plugins/vfspk3/vfs.cpp
View File

@ -60,6 +60,7 @@ ArchiveModules& FileSystemQ3API_getArchiveModules();
#include "stream/stringstream.h"
#include "os/path.h"
#include "moduleobservers.h"
#include "filematch.h"
#define VFS_MAXDIRS 64
@ -316,7 +317,7 @@ void InitDirectory(const char* directory, ArchiveModules& archiveModules)
for(j = 0; j < g_numForbiddenDirs; ++j)
{
const char *p = strrchr(directory, '/');
p = (p ? (p+1) : path);
p = (p ? (p+1) : directory);
if(matchpattern(p, g_strForbiddenDirs[j], TRUE))
break;
}