X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6477b92b7d51a6ec7a26cf7bae1e8c7637995e4..feffc1b546b896b64b24def29d03e1d404f92a70:/tests/Makefile.in diff --git a/tests/Makefile.in b/tests/Makefile.in index 38e9ea595a..0a5a5e51b7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.6 (http://bakefile.sourceforge.net) +# Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -11,7 +11,8 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ -RESCOMP = @RESCOMP@ +WINDRES = @WINDRES@ +REZ = @REZ@ SETFILE = @SETFILE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -26,7 +27,7 @@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ +TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -36,11 +37,13 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_VERSION = $(WX_RELEASE).4 +WX_RELEASE = 2.7 +WX_VERSION = $(WX_RELEASE).0 LIBDIRNAME = $(top_builddir)lib TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(srcdir) $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) TEST_OBJECTS = \ test_test.o \ test_archivetest.o \ @@ -48,6 +51,7 @@ TEST_OBJECTS = \ test_arrays.o \ test_datetimetest.o \ test_fileconftest.o \ + test_filekind.o \ test_filenametest.o \ test_filesystest.o \ test_fontmaptest.o \ @@ -55,13 +59,17 @@ TEST_OBJECTS = \ test_hashes.o \ test_lists.o \ test_longlongtest.o \ + test_convautotest.o \ test_mbconvtest.o \ test_regextest.o \ test_wxregextest.o \ + test_scopeguardtest.o \ test_strings.o \ test_stdstrings.o \ + test_tokenizer.o \ test_unicode.o \ test_crt.o \ + test_vsnprintf.o \ test_bstream.o \ test_datastreamtest.o \ test_ffilestream.o \ @@ -69,12 +77,15 @@ TEST_OBJECTS = \ test_largefile.o \ test_memstream.o \ test_sstream.o \ + test_tempfile.o \ test_textstreamtest.o \ test_zlibstream.o \ + test_textfiletest.o \ test_uris.o TEST_ODEP = $(___pch_testprec_test_testprec_h_gch___depname) TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../samples \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../samples \ $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) TEST_GUI_OBJECTS = \ $(__test_gui___win32rc) \ @@ -103,8 +114,9 @@ TEST_GUI_ODEP = $(___pch_testprec_test_gui_testprec_h_gch___depname) @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) @COND_GCC_PCH_1@__test_PCH_INC = -I.pch/testprec_test -@COND_GCC_PCH_1@___pch_testprec_test_testprec_h_gch___depname \ -@COND_GCC_PCH_1@ = .pch/testprec_test/testprec.h.gch +@COND_ICC_PCH_1@__test_PCH_INC = -use_pch .pch/testprec_test/testprec.h.gch +@COND_USE_PCH_1@___pch_testprec_test_testprec_h_gch___depname \ +@COND_USE_PCH_1@ = .pch/testprec_test/testprec.h.gch COND_MONOLITHIC_0___WXLIB_NET_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p) @@ -114,8 +126,18 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \ @COND_PLATFORM_MAC_1@__test_gui___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_4 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_5 = --define __WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_4 = -d wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_5 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_4 = -d wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_5 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_4 = -d wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_5 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p_4 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_5 = --define WXUSINGDLL +@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__test_gui___win32rc = test_gui_sample_rc.o @COND_PLATFORM_OS2_1@__test_gui_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @@ -125,24 +147,13 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \ @COND_TOOLKIT_MAC@____test_gui_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_MAC@ test_gui.app/Contents/PkgInfo @COND_GCC_PCH_1@__test_gui_PCH_INC = -I.pch/testprec_test_gui -@COND_GCC_PCH_1@___pch_testprec_test_gui_testprec_h_gch___depname \ -@COND_GCC_PCH_1@ = .pch/testprec_test_gui/testprec.h.gch +@COND_ICC_PCH_1@__test_gui_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@ .pch/testprec_test_gui/testprec.h.gch +@COND_USE_PCH_1@___pch_testprec_test_gui_testprec_h_gch___depname \ +@COND_USE_PCH_1@ = .pch/testprec_test_gui/testprec.h.gch COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \ - $(srcdir)/../samples -i $(top_srcdir)/include -o test_gui$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) -@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)-$(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)-$(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@ = \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @@ -152,6 +163,23 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) \ + $(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \ + $(srcdir)/../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ + test_gui$(EXEEXT) Carbon.r sample.r +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +COND_MONOLITHIC_0___WXLIB_BASE_p = \ + -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)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(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 = \ @@ -183,21 +211,21 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile test$(EXEEXT): $(TEST_OBJECTS) - $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -@COND_GCC_PCH_1@.pch/testprec_test/testprec.h.gch: -@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS) +@COND_USE_PCH_1@.pch/testprec_test/testprec.h.gch: +@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS) @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) +@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) @COND_USE_GUI_1@ $(__test_gui___mac_rezcmd) @COND_USE_GUI_1@ $(__test_gui___mac_setfilecmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) -test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p test_gui.app/Contents mkdir -p test_gui.app/Contents/MacOS mkdir -p test_gui.app/Contents/Resources @@ -215,18 +243,17 @@ test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/car ln -f test_gui$(EXEEXT) test_gui.app/Contents/MacOS/test_gui - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc test_gui.app/Contents/Resources/test_gui.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test_gui.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@test_gui_bundle: $(____test_gui_BUNDLE_TGT_REF_DEP) -@COND_GCC_PCH_1@.pch/testprec_test_gui/testprec.h.gch: -@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS) +@COND_USE_PCH_1@.pch/testprec_test_gui/testprec.h.gch: +@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS) data: @mkdir -p . @for f in testdata.fc; do \ - if test ! -e ./$$f ; \ + if test ! -f ./$$f -a ! -d ./$$f ; \ then x=yep ; \ else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ fi; \ @@ -253,6 +280,9 @@ test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP) test_fileconftest.o: $(srcdir)/fileconf/fileconftest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/fileconf/fileconftest.cpp +test_filekind.o: $(srcdir)/filekind/filekind.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/filekind/filekind.cpp + test_filenametest.o: $(srcdir)/filename/filenametest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/filename/filenametest.cpp @@ -274,6 +304,9 @@ test_lists.o: $(srcdir)/lists/lists.cpp $(TEST_ODEP) test_longlongtest.o: $(srcdir)/longlong/longlongtest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/longlong/longlongtest.cpp +test_convautotest.o: $(srcdir)/mbconv/convautotest.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/mbconv/convautotest.cpp + test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/mbconv/mbconvtest.cpp @@ -283,18 +316,27 @@ test_regextest.o: $(srcdir)/regex/regextest.cpp $(TEST_ODEP) test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/regex/wxregextest.cpp +test_scopeguardtest.o: $(srcdir)/scopeguard/scopeguardtest.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/scopeguard/scopeguardtest.cpp + test_strings.o: $(srcdir)/strings/strings.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/strings.cpp test_stdstrings.o: $(srcdir)/strings/stdstrings.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/stdstrings.cpp +test_tokenizer.o: $(srcdir)/strings/tokenizer.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/tokenizer.cpp + test_unicode.o: $(srcdir)/strings/unicode.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/unicode.cpp test_crt.o: $(srcdir)/strings/crt.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/crt.cpp +test_vsnprintf.o: $(srcdir)/strings/vsnprintf.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/vsnprintf.cpp + test_bstream.o: $(srcdir)/streams/bstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/bstream.cpp @@ -316,17 +358,23 @@ test_memstream.o: $(srcdir)/streams/memstream.cpp $(TEST_ODEP) test_sstream.o: $(srcdir)/streams/sstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/sstream.cpp +test_tempfile.o: $(srcdir)/streams/tempfile.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/tempfile.cpp + test_textstreamtest.o: $(srcdir)/streams/textstreamtest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/textstreamtest.cpp test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/zlibstream.cpp +test_textfiletest.o: $(srcdir)/textfile/textfiletest.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/textfile/textfiletest.cpp + test_uris.o: $(srcdir)/uris/uris.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/uris/uris.cpp test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../samples --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5) --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include test_gui_test.o: $(srcdir)/test.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/test.cpp