[Fte-cvs] fte/src e_search.cpp,1.5,1.6 e_win32.cpp,1.1.1.1,1.2 fte-msvc.mak,1.8,1.9

[Vesa J. <ch...@us...>]

Update of /cvsroot/fte/fte/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14802

Modified Files:
	e_search.cpp e_win32.cpp fte-msvc.mak 
Log Message:
Made search & replace option case insensitive and modified source to be compilable cleanly with newer MSVC.


Index: e_search.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/e_search.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- e_search.cpp	17 Jan 2004 17:58:19 -0000	1.5
+++ e_search.cpp	8 Feb 2005 23:06:40 -0000	1.6
@@ -10,7 +10,7 @@
 #include "fte.h"
 
 int ParseSearchOption(int replace, char c, unsigned long &opt) {
-    switch (c) {
+    switch (tolower(c)) {
     case 'a': opt |= SEARCH_ALL; break;      // search all occurances
     case 'b': opt |= SEARCH_BLOCK; break;    // search in block only
     case 'c': opt &= ~SEARCH_NEXT; break;    // search from current position

Index: e_win32.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/e_win32.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- e_win32.cpp	30 Jan 2000 17:19:09 -0000	1.1.1.1
+++ e_win32.cpp	8 Feb 2005 23:06:40 -0000	1.2
@@ -11,6 +11,9 @@
 
 #include "fte.h"
 
+// Silence warnings about redefinition, we don't need this here anyway.
+#undef SEARCH_ALL
+
 #include <windows.h>
 
 int EView::SysShowHelp(ExState &State, const char *word) {

Index: fte-msvc.mak
===================================================================
RCS file: /cvsroot/fte/fte/src/fte-msvc.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fte-msvc.mak	4 Apr 2002 19:29:52 -0000	1.8
+++ fte-msvc.mak	8 Feb 2005 23:06:40 -0000	1.9
@@ -14,9 +14,17 @@
 
 #APPOPTIONS = -DDEFAULT_INTERNAL_CONFIG
 #/Fm /GF /J
-CCFLAGS   = $(OPTIMIZE) -DNT -DNTCONSOLE -DMSVC -DWIN32 -D_CONSOLE -DNO_NEW_CPP_FEATURES $(INCDIR) /GX \
+
+# Use these settings for MSVC 6
+#CCFLAGS   = $(OPTIMIZE) -DNT -DNTCONSOLE -DMSVC -DWIN32 -D_CONSOLE -DNO_NEW_CPP_FEATURES $(INCDIR) /GX \
+#	$(APPOPTIONS) $(DEBUG) \
+#	/nologo /W3 /J # /YX
+
+# Use these settings for MSVC 2003
+CCFLAGS   = $(OPTIMIZE) -DNT -DNTCONSOLE -DMSVC -DWIN32 -D_CONSOLE $(INCDIR) /GX \
 	$(APPOPTIONS) $(DEBUG) \
 	/nologo /W3 /J # /YX
+
 LDFLAGS   = $(OPTIMIZE) $(LIBDIR) /nologo
 RCFLAGS   =