diff options
| author | mniip <mniip@mniip.com> | 2013-08-22 13:52:32 (GMT) |
|---|---|---|
| committer | mniip <mniip@mniip.com> | 2013-08-22 13:52:32 (GMT) |
| commit | 4a308cbf661bb40efdf53c6632f875c6c393a307 (patch) | |
| tree | a2e4c6801c2b09e91d52bb0d1539b1b8ec80704b | |
| parent | 4e9fe8b8e731d2edd5de254c0fd7b9162ebb0c77 (diff) | |
| download | powder-4a308cbf661bb40efdf53c6632f875c6c393a307.zip powder-4a308cbf661bb40efdf53c6632f875c6c393a307.tar.gz | |
oh, and remove dependency
| -rwxr-xr-x | SConscript | 2 | ||||
| -rw-r--r-- | src/Misc.cpp | 12 | ||||
| -rw-r--r-- | src/Misc.h | 2 |
3 files changed, 1 insertions, 15 deletions
@@ -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 3128691..6b0c1d5 100644 --- a/src/Misc.cpp +++ b/src/Misc.cpp @@ -2,7 +2,6 @@ #include <sstream> #include <stdlib.h> #include <string.h> -#include <regex.h> #include <sys/types.h> #include <cmath> #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); @@ -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); |
