more compile fail

diff --git a/Makefile b/Makefile
index 1f8b26a9baddb4bb41e9032fc60137a76200bbc6..8f7d036c4dfb2224c0d617d64495ac788ab427c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -695,7 +695,6 @@ $(INSTALLDIR)/radiant.$(EXE): \
        radiant/xmlstuff.o \
        radiant/xywindow.o \
        libcmdlib.$(A) \
        radiant/xmlstuff.o \
        radiant/xywindow.o \
        libcmdlib.$(A) \

-       libfilematch.$(A) \

        libgtkutil.$(A) \
        libl_net.$(A) \
        libmathlib.$(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 \
        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
 
 $(INSTALLDIR)/plugins/bobtoolz.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK)
 $(INSTALLDIR)/plugins/bobtoolz.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude

diff --git a/libs/filematch.h b/libs/filematch.h
index f8018096bc694f65ab1842a3197331b0bbde3948..f075b75c062956640500bfc0dd6f7dfa30234e91 100644 (file)
--- a/libs/filematch.h
+++ b/libs/filematch.h
@@ -1,7 +1,16 @@
 #if !defined(INCLUDED_FILEMATCH_H)
 #define INCLUDED_FILEMATCH_H
 
 #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);
 
 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
 #endif

diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index 8890edd27f5ef639f29dfefb9a3a5636f757ee16..bea0adb44079912412f58a091de3567d92a753e9 100644 (file)
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -60,6 +60,7 @@ ArchiveModules& FileSystemQ3API_getArchiveModules();
 #include "stream/stringstream.h"
 #include "os/path.h"
 #include "moduleobservers.h"
 #include "stream/stringstream.h"
 #include "os/path.h"
 #include "moduleobservers.h"

+#include "filematch.h"

 
 
 #define VFS_MAXDIRS 64
 
 
 #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, '/');
   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;
   }
     if(matchpattern(p, g_strForbiddenDirs[j], TRUE))
       break;
   }