X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e05df3c7ff33db7eab01f5012ab218ac2843cea..f9189014b7162155ab7d4b329c0e5c99bbd9acf3:/tests/Makefile.in?ds=inline diff --git a/tests/Makefile.in b/tests/Makefile.in index 4827514091..363babc150 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ BK_DEPS = @BK_DEPS@ BK_MAKE_PCH = @BK_MAKE_PCH@ @@ -57,6 +56,7 @@ TEST_OBJECTS = \ test_tartest.o \ test_arrays.o \ test_base64.o \ + test_cmdlinetest.o \ test_fileconf.o \ test_datetimetest.o \ test_filekind.o \ @@ -70,6 +70,8 @@ TEST_OBJECTS = \ test_longlongtest.o \ test_convautotest.o \ test_mbconvtest.o \ + test_misctests.o \ + test_ipc.o \ test_regextest.o \ test_wxregextest.o \ test_scopeguardtest.o \ @@ -87,8 +89,10 @@ TEST_OBJECTS = \ test_ffilestream.o \ test_fileback.o \ test_filestream.o \ + test_iostreams.o \ test_largefile.o \ test_memstream.o \ + test_socketstream.o \ test_sstream.o \ test_tempfile.o \ test_textstreamtest.o \ @@ -96,6 +100,7 @@ TEST_OBJECTS = \ test_textfiletest.o \ test_atomic.o \ test_queue.o \ + test_tls.o \ test_uris.o \ test_vectors.o \ test_evtconnection.o \ @@ -115,8 +120,11 @@ TEST_GUI_OBJECTS = \ test_gui_size.o \ test_gui_point.o \ test_gui_config.o \ + test_gui_textctrltest.o \ + test_gui_rawbmp.o \ + test_gui_selstoretest.o \ test_gui_clientsize.o \ - test_gui_textctrltest.o + test_gui_setsize.o TEST_GUI_ODEP = $(___pch_testprec_test_gui_testprec_h_gch___depname) PRINTFBENCH_CXXFLAGS = $(__printfbench_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -157,30 +165,25 @@ COND_MONOLITHIC_0___WXLIB_XML_p = \ @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT) @COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__test_gui___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test_gui$(EXEEXT) -@COND_PLATFORM_MAC_1@__test_gui___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_4 = -d __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test_gui$(EXEEXT) @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 -@COND_PLATFORM_MACOSX_1@__test_gui_bundle___depname = test_gui_bundle +@COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_app_Contents_PkgInfo___depname \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = test_gui.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_bundle___depname \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = test_gui_bundle @COND_TOOLKIT_COCOA@____test_gui_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ test_gui.app/Contents/PkgInfo +@COND_TOOLKIT_COCOA@ $(__test_gui_app_Contents_PkgInfo___depname) @COND_TOOLKIT_MAC@____test_gui_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_MAC@ test_gui.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@ $(__test_gui_app_Contents_PkgInfo___depname) @COND_GCC_PCH_1@__test_gui_PCH_INC = -I.pch/testprec_test_gui @COND_ICC_PCH_1@__test_gui_PCH_INC = -use_pch \ @COND_ICC_PCH_1@ .pch/testprec_test_gui/testprec.h.gch @@ -206,12 +209,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ @COND_ICC_PCH_1@ .pch/testprec_printfbench/testprec.h.gch @COND_USE_PCH_1@___pch_testprec_printfbench_testprec_h_gch___depname \ @COND_USE_PCH_1@ = .pch/testprec_printfbench/testprec.h.gch -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 @@ -263,31 +260,31 @@ test$(EXEEXT): $(TEST_OBJECTS) @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) $(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_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_GUI_1@ $(__test_gui___mac_rezcmd) +@COND_USE_GUI_1@ @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 $(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 - - - sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ - -e "s/EXECUTABLE/test_gui/" \ - -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/carbon/Info.plist.in >test_gui.app/Contents/Info.plist - - - echo -n "APPL????" >test_gui.app/Contents/PkgInfo - - - ln -f test_gui$(EXEEXT) test_gui.app/Contents/MacOS/test_gui - - - 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_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents/MacOS +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents/Resources +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/EXECUTABLE/test_gui/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/VERSION/$(WX_VERSION)/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >test_gui.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ echo -n "APPL????" >test_gui.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ ln -f test_gui$(EXEEXT) test_gui.app/Contents/MacOS/test_gui +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test_gui.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui_bundle: $(____test_gui_BUNDLE_TGT_REF_DEP) @COND_USE_PCH_1@.pch/testprec_test_gui/testprec.h.gch: @COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS) @@ -343,6 +340,9 @@ test_arrays.o: $(srcdir)/arrays/arrays.cpp $(TEST_ODEP) test_base64.o: $(srcdir)/base64/base64.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/base64/base64.cpp +test_cmdlinetest.o: $(srcdir)/cmdline/cmdlinetest.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/cmdline/cmdlinetest.cpp + test_fileconf.o: $(srcdir)/config/fileconf.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/config/fileconf.cpp @@ -382,6 +382,12 @@ test_convautotest.o: $(srcdir)/mbconv/convautotest.cpp $(TEST_ODEP) test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/mbconv/mbconvtest.cpp +test_misctests.o: $(srcdir)/misc/misctests.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/misctests.cpp + +test_ipc.o: $(srcdir)/net/ipc.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/net/ipc.cpp + test_regextest.o: $(srcdir)/regex/regextest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/regex/regextest.cpp @@ -433,12 +439,18 @@ test_fileback.o: $(srcdir)/streams/fileback.cpp $(TEST_ODEP) test_filestream.o: $(srcdir)/streams/filestream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/filestream.cpp +test_iostreams.o: $(srcdir)/streams/iostreams.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/iostreams.cpp + test_largefile.o: $(srcdir)/streams/largefile.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/largefile.cpp test_memstream.o: $(srcdir)/streams/memstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/memstream.cpp +test_socketstream.o: $(srcdir)/streams/socketstream.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/socketstream.cpp + test_sstream.o: $(srcdir)/streams/sstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/sstream.cpp @@ -460,6 +472,9 @@ test_atomic.o: $(srcdir)/thread/atomic.cpp $(TEST_ODEP) test_queue.o: $(srcdir)/thread/queue.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/thread/queue.cpp +test_tls.o: $(srcdir)/thread/tls.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/thread/tls.cpp + test_uris.o: $(srcdir)/uris/uris.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/uris/uris.cpp @@ -496,16 +511,34 @@ test_gui_point.o: $(srcdir)/geometry/point.cpp $(TEST_GUI_ODEP) test_gui_config.o: $(srcdir)/config/config.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/config/config.cpp -test_gui_clientsize.o: $(srcdir)/controls/clientsize.cpp $(TEST_GUI_ODEP) - $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/clientsize.cpp - test_gui_textctrltest.o: $(srcdir)/controls/textctrltest.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/textctrltest.cpp +test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp + +test_gui_selstoretest.o: $(srcdir)/misc/selstoretest.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/selstoretest.cpp + +test_gui_clientsize.o: $(srcdir)/window/clientsize.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/window/clientsize.cpp + +test_gui_setsize.o: $(srcdir)/window/setsize.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/window/setsize.cpp + printfbench_printfbench.o: $(srcdir)/benchmarks/printfbench.cpp $(PRINTFBENCH_ODEP) $(CXXC) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(srcdir)/benchmarks/printfbench.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d