diff --git a/Changes b/Changes index 15cc60aa4..e0f057d3d 100644 --- a/Changes +++ b/Changes @@ -2419,3 +2419,5 @@ seen. gmtime warning still there - Fixed a problem in the new win32 resolver code - Added HOOKTYPE_UNKUSER_QUIT (disconnects of unregistered clients). - Fixed a Linux PPC problem (#0001242) +- Made the win32 version use libtre for regex rather than GNU regex + libtre is smaller, faster, and more feature rich. diff --git a/makefile.win32 b/makefile.win32 index 4446c4f77..7569c8993 100644 --- a/makefile.win32 +++ b/makefile.win32 @@ -70,7 +70,7 @@ CONF: ./WIRCD.EXE: $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES - $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/GNU_REGEX.LIB /MAPINFO:LINES /MAP + $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB /MAPINFO:LINES /MAP -@erase src\win32\win32.res !IFNDEF DEBUG @echo Non Debug version built diff --git a/makefile.win32.ssl b/makefile.win32.ssl index 3e8683f7f..3f90524c0 100644 --- a/makefile.win32.ssl +++ b/makefile.win32.ssl @@ -73,7 +73,7 @@ CONF: ./WIRCD.EXE: $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES - $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/GNU_REGEX.LIB /MAPINFO:LINES /MAP + $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB /MAPINFO:LINES /MAP -@erase src\win32\win32.res !IFNDEF DEBUG @echo Non Debug version built diff --git a/makefile.win32.ssl.ziplink b/makefile.win32.ssl.ziplink index 06f9034cf..19d079f1b 100644 --- a/makefile.win32.ssl.ziplink +++ b/makefile.win32.ssl.ziplink @@ -80,7 +80,7 @@ CONF: ./WIRCD.EXE: $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES - $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/GNU_REGEX.LIB /MAPINFO:LINES /MAP + $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB /MAPINFO:LINES /MAP -@erase src\win32\win32.res !IFNDEF DEBUG @echo Non Debug version built diff --git a/makefile.win32.ziplink b/makefile.win32.ziplink index e637b161e..f3f2a9bdf 100644 --- a/makefile.win32.ziplink +++ b/makefile.win32.ziplink @@ -75,7 +75,7 @@ CONF: ./WIRCD.EXE: $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES - $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/GNU_REGEX.LIB /MAPINFO:LINES /MAP + $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB /MAPINFO:LINES /MAP -@erase src\win32\win32.res !IFNDEF DEBUG @echo Non Debug version built diff --git a/src/win32/gnu_regex.dll b/src/win32/gnu_regex.dll deleted file mode 100644 index e5d929f7f..000000000 Binary files a/src/win32/gnu_regex.dll and /dev/null differ diff --git a/src/win32/gnu_regex.lib b/src/win32/gnu_regex.lib deleted file mode 100644 index ff6054bdb..000000000 Binary files a/src/win32/gnu_regex.lib and /dev/null differ diff --git a/src/win32/tre.lib b/src/win32/tre.lib new file mode 100644 index 000000000..fcfe4b016 Binary files /dev/null and b/src/win32/tre.lib differ diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index 873016d73..b613ca5f0 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -51,7 +51,6 @@ Source: "..\..\badwords.message.conf"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\Changes"; DestDir: "{app}"; DestName: "Changes.txt"; Flags: ignoreversion Source: "..\..\Changes.old"; DestDir: "{app}"; DestName: "Changes.old.txt"; Flags: ignoreversion Source: "..\..\Donation"; DestDir: "{app}"; DestName: "Donation.txt"; Flags: ignoreversion -Source: ".\gnu_regex.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\help.conf"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\LICENSE"; DestDir: "{app}"; DestName: "LICENSE.txt"; Flags: ignoreversion Source: "..\..\Unreal.nfo"; DestDir: "{app}"; Flags: ignoreversion