X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/816b59debff180edf0f7e04f465c88bd0cc6d060..34621cc5d6eaf8933935fbda55625124429a0ff9:/tests/makefile.bcc diff --git a/tests/makefile.bcc b/tests/makefile.bcc index eb83942a46..c1b1498036 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -21,6 +21,7 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +WX_RELEASE_NODOT = 25 OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ @@ -35,6 +36,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 \ @@ -47,8 +50,10 @@ 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_fontmap.obj \ + $(OBJS)\test_datetime.obj ### Conditionally set variables: ### @@ -107,11 +112,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 @@ -187,6 +193,12 @@ $(OBJS)\test_regex.obj: .\regex\regex.cpp $(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_fileconf.obj: .\fileconf\fileconf.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_filename.obj: .\filename\filename.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_filesys.obj: .\filesys\filesys.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** @@ -223,8 +235,14 @@ $(OBJS)\test_filestream.obj: .\streams\filestream.cpp $(OBJS)\test_memstream.obj: .\streams\memstream.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_sstream.obj: .\streams\sstream.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**