lastChar was defined as a char when it should have been an int

[wxWidgets.git] / tests / makefile.vc

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 9d5f4aab7ef1a3fa6bd2d2a9d67026626f8b257a..dec67524b92d0b77a89c67f6c6551695e0fb9821 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -27,9 +27,17 @@ TEST_OBJECTS =  \
        $(OBJS)\test_main.obj \
        $(OBJS)\test_formatconverter.obj \
        $(OBJS)\test_regex.obj \
+       $(OBJS)\test_wxregex.obj \
        $(OBJS)\test_filesys.obj \
        $(OBJS)\test_arrays.obj \
-       $(OBJS)\test_longlong.obj
+       $(OBJS)\test_longlong.obj \
+       $(OBJS)\test_strings.obj \
+       $(OBJS)\test_unicode.obj \
+       $(OBJS)\test_bstream.obj \
+       $(OBJS)\test_ffilestream.obj \
+       $(OBJS)\test_filestream.obj \
+       $(OBJS)\test_memstream.obj \
+       $(OBJS)\test_zlibstream.obj
 
 ### Conditionally set variables: ###
 
@@ -198,7 +206,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\test.exe
+all: $(OBJS)\test.exe data
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -212,6 +220,10 @@ $(OBJS)\test.exe: $(TEST_OBJECTS)
        $(TEST_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
 <<
 
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
 $(OBJS)\test_test.obj: .\test.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
@@ -224,6 +236,9 @@ $(OBJS)\test_formatconverter.obj: .\formatconverter\formatconverter.cpp
 $(OBJS)\test_regex.obj: .\regex\regex.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_filesys.obj: .\filesys\filesys.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
@@ -232,3 +247,24 @@ $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
 
 $(OBJS)\test_longlong.obj: .\longlong\longlong.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_strings.obj: .\strings\strings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_unicode.obj: .\strings\unicode.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_bstream.obj: .\streams\bstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_filestream.obj: .\streams\filestream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_memstream.obj: .\streams\memstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**