added wxStringTokenizer::GetPosition() test

[wxWidgets.git] / tests / makefile.vc

diff --git a/tests/makefile.vc b/tests/makefile.vc
index be8b151c47432b38ae2df54cb02ff6a5a7306ade..de53b466fb1c834dae542cd9e77e2ba38b27fbfa 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -12,6 +12,7 @@
 
 ### Variables: ###
 
+WX_RELEASE_NODOT = 25
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
@@ -28,6 +29,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_formatconverter.obj \
        $(OBJS)\test_regex.obj \
        $(OBJS)\test_wxregex.obj \
+       $(OBJS)\test_fileconf.obj \
+       $(OBJS)\test_filename.obj \
        $(OBJS)\test_filesys.obj \
        $(OBJS)\test_arrays.obj \
        $(OBJS)\test_hashes.obj \
@@ -40,6 +43,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ffilestream.obj \
        $(OBJS)\test_filestream.obj \
        $(OBJS)\test_memstream.obj \
+       $(OBJS)\test_sstream.obj \
        $(OBJS)\test_zlibstream.obj \
        $(OBJS)\test_fontmap.obj \
        $(OBJS)\test_datetime.obj
@@ -179,11 +183,12 @@ __UNICODE_DEFINE_p = /D_UNICODE
 __DLLFLAG_p = /DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -244,6 +249,12 @@ $(OBJS)\test_regex.obj: .\regex\regex.cpp
 $(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_fileconf.obj: .\fileconf\fileconf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_filename.obj: .\filename\filename.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_filesys.obj: .\filesys\filesys.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
@@ -280,6 +291,9 @@ $(OBJS)\test_filestream.obj: .\streams\filestream.cpp
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_sstream.obj: .\streams\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**