From edcccd84c367a8c4f737edecf92a7b3904e95266 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 24 Jun 2004 08:05:50 +0000 Subject: [PATCH] Regenerated makefiles. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/Makefile.in | 14 +++++++------- tests/makefile.bcc | 6 +++++- tests/makefile.gcc | 6 +++++- tests/makefile.vc | 6 +++++- tests/makefile.wat | 15 ++++++--------- tests/test.bkl | 1 + tests/test.dsp | 6 +++--- 7 files changed, 32 insertions(+), 22 deletions(-) diff --git a/tests/Makefile.in b/tests/Makefile.in index 86b8dd9281..9923a9250e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -54,7 +54,8 @@ TEST_OBJECTS = \ test_filestream.o \ test_memstream.o \ test_zlibstream.o \ - test_fontmap.o + test_fontmap.o \ + test_datetime.o ### Conditionally set variables: ### @@ -120,13 +121,9 @@ test$(EXEEXT): $(TEST_OBJECTS) data: @mkdir -p . @for f in testdata.fc; do \ - if test ! -e ./$$f ; \ - then x=yep ; \ - else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ + if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f \) ; then \ + cp -pRf $(srcdir)/$$f . ; \ fi; \ - case "$$x" in ?*) \ - cp -pRf $(srcdir)/$$f . ;; \ - esac; \ done test_test.o: $(srcdir)/test.cpp @@ -186,6 +183,9 @@ test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp test_fontmap.o: $(srcdir)/fontmap/fontmap.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< +test_datetime.o: $(srcdir)/datetime/datetime.cpp + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/tests/makefile.bcc b/tests/makefile.bcc index eb83942a46..eaff025745 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -48,7 +48,8 @@ TEST_OBJECTS = \ $(OBJS)\test_filestream.obj \ $(OBJS)\test_memstream.obj \ $(OBJS)\test_zlibstream.obj \ - $(OBJS)\test_fontmap.obj + $(OBJS)\test_fontmap.obj \ + $(OBJS)\test_datetime.obj ### Conditionally set variables: ### @@ -228,3 +229,6 @@ $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp $(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) $** diff --git a/tests/makefile.gcc b/tests/makefile.gcc index e66d425be3..8a59317f66 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -39,7 +39,8 @@ TEST_OBJECTS = \ $(OBJS)\test_filestream.o \ $(OBJS)\test_memstream.o \ $(OBJS)\test_zlibstream.o \ - $(OBJS)\test_fontmap.o + $(OBJS)\test_fontmap.o \ + $(OBJS)\test_datetime.o ### Conditionally set variables: ### @@ -223,4 +224,7 @@ $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp $(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< +$(OBJS)\test_datetime.o: ./datetime/datetime.cpp + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< + .PHONY: all clean data diff --git a/tests/makefile.vc b/tests/makefile.vc index 88a81a75d2..be8b151c47 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -41,7 +41,8 @@ TEST_OBJECTS = \ $(OBJS)\test_filestream.obj \ $(OBJS)\test_memstream.obj \ $(OBJS)\test_zlibstream.obj \ - $(OBJS)\test_fontmap.obj + $(OBJS)\test_fontmap.obj \ + $(OBJS)\test_datetime.obj ### Conditionally set variables: ### @@ -284,3 +285,6 @@ $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp $(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** diff --git a/tests/makefile.wat b/tests/makefile.wat index 007cc5f8c0..1502df81b6 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -103,13 +103,6 @@ __RUNTIME_LIBS_5 = -br !ifeq RUNTIME_LIBS static __RUNTIME_LIBS_5 = !endif -__EXCEPTIONSFLAG_6 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_6 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_6 = -xr -!endif __EXCEPTIONSFLAG_7 = !ifeq USE_EXCEPTIONS 0 __EXCEPTIONSFLAG_7 = @@ -176,7 +169,7 @@ SETUPHDIR = & TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=.\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) & - $(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & $(OBJS)\test_test.obj & $(OBJS)\test_main.obj & @@ -196,7 +189,8 @@ TEST_OBJECTS = & $(OBJS)\test_filestream.obj & $(OBJS)\test_memstream.obj & $(OBJS)\test_zlibstream.obj & - $(OBJS)\test_fontmap.obj + $(OBJS)\test_fontmap.obj & + $(OBJS)\test_datetime.obj all : $(OBJS) @@ -285,3 +279,6 @@ $(OBJS)\test_zlibstream.obj : .AUTODEPEND .\streams\zlibstream.cpp $(OBJS)\test_fontmap.obj : .AUTODEPEND .\fontmap\fontmap.cpp $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< + +$(OBJS)\test_datetime.obj : .AUTODEPEND .\datetime\datetime.cpp + $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< diff --git a/tests/test.bkl b/tests/test.bkl index 0e3d193007..3257a9b7c4 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -27,6 +27,7 @@ streams/memstream.cpp streams/zlibstream.cpp fontmap/fontmap.cpp + datetime/datetime.cpp base diff --git a/tests/test.dsp b/tests/test.dsp index 018bb9503f..cddbaa636b 100644 --- a/tests/test.dsp +++ b/tests/test.dsp @@ -439,15 +439,15 @@ SOURCE=.\arrays\arrays.cpp # End Source File # Begin Source File -SOURCE=.\datetime\datetime.cpp +SOURCE=.\streams\bstream.cpp # End Source File # Begin Source File -SOURCE=.\streams\bstream.cpp +SOURCE=.\strings\crt.cpp # End Source File # Begin Source File -SOURCE=.\strings\crt.cpp +SOURCE=.\datetime\datetime.cpp # End Source File # Begin Source File -- 2.45.2