From 4a308cbf661bb40efdf53c6632f875c6c393a307 Mon Sep 17 00:00:00 2001 From: mniip Date: Thu, 22 Aug 2013 17:52:32 +0400 Subject: [PATCH] oh, and remove dependency --- SConscript | 2 +- src/Misc.cpp | 12 ------------ src/Misc.h | 2 -- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/SConscript b/SConscript index 0e5068d38..a69b981d2 100755 --- a/SConscript +++ b/SConscript @@ -285,7 +285,7 @@ if(GetOption('rpi')): if(GetOption('win')): openGLLibs = ['opengl32', 'glew32'] - env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'SDL', 'regex']) + env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'SDL']) env.Append(CCFLAGS=['-std=gnu++98']) env.Append(LIBS=['winmm', 'gdi32']) env.Append(CPPDEFINES=["WIN"]) diff --git a/src/Misc.cpp b/src/Misc.cpp index 3128691cf..6b0c1d537 100644 --- a/src/Misc.cpp +++ b/src/Misc.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include "Config.h" @@ -173,17 +172,6 @@ void clean_text(char *text, int vwidth) } } -int sregexp(const char *str, char *pattern) -{ - int result; - regex_t patternc; - if (regcomp(&patternc, pattern, 0)!=0) - return 1; - result = regexec(&patternc, str, 0, NULL, 0); - regfree(&patternc); - return result; -} - void save_string(FILE *f, char *str) { int li = strlen(str); diff --git a/src/Misc.h b/src/Misc.h index 1a43fe34b..33601f632 100644 --- a/src/Misc.h +++ b/src/Misc.h @@ -62,8 +62,6 @@ void load_presets(void); void save_string(FILE *f, char *str); -int sregexp(const char *str, char *pattern); - int load_string(FILE *f, char *str, int max); void strcaturl(char *dst, char *src);