X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa8642327cadec69f7f28f40f381c88691feda1..b7edbfa0198f1ccf287516082b683a8078f5d8b1:/tests/makefile.vc diff --git a/tests/makefile.vc b/tests/makefile.vc index 48817a4628..de53b466fb 100644 --- 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,7 @@ 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 \ @@ -41,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 @@ -180,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 @@ -245,6 +249,9 @@ $(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) $** @@ -284,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) $**