X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/589e20d03c8fd08520ae279f5e5ebcc6efde321b..15e2adbd3b3f0904851f73995fc9bf3c83d122d3:/tests/Makefile.in?ds=sidebyside diff --git a/tests/Makefile.in b/tests/Makefile.in index 58d64d41d6..b1f2240832 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -43,6 +43,7 @@ TEST_OBJECTS = \ test_formatconverter.o \ test_regex.o \ test_wxregex.o \ + test_fileconf.o \ test_filename.o \ test_filesys.o \ test_arrays.o \ @@ -77,10 +78,10 @@ TEST_OBJECTS = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX) + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ @@ -94,7 +95,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ -@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @@ -147,6 +148,9 @@ test_regex.o: $(srcdir)/regex/regex.cpp test_wxregex.o: $(srcdir)/regex/wxregex.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< +test_fileconf.o: $(srcdir)/fileconf/fileconf.cpp + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< + test_filename.o: $(srcdir)/filename/filename.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<