From 8899b155a1e4fa5f4b90e1f3bebe28088ea46bc9 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Mon, 22 Nov 2004 05:00:19 +0000 Subject: [PATCH] [ 1068188 ] Precompiled header for the test program [Modified a bit] Regen bakefiles for unit tests git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/Makefile.in | 65 +++--- tests/archive/archivetest.cpp | 35 ++- tests/arrays/arrays.cpp | 4 +- tests/datetime/datetimetest.cpp | 4 +- tests/dummy.cpp | 28 +++ tests/fileconf/fileconftest.cpp | 29 +-- tests/filename/filenametest.cpp | 4 +- tests/filesys/filesystest.cpp | 4 +- tests/fontmap/fontmaptest.cpp | 4 +- tests/formatconverter/formatconvertertest.cpp | 4 +- tests/hashes/hashes.cpp | 4 +- tests/longlong/longlongtest.cpp | 4 +- tests/makefile.bcc | 17 +- tests/makefile.gcc | 12 + tests/makefile.vc | 17 +- tests/makefile.wat | 17 +- tests/mbconv/mbconvtest.cpp | 4 +- tests/regex/regextest.cpp | 4 +- tests/regex/wxregextest.cpp | 3 +- tests/streams/bstream.cpp | 9 +- tests/streams/ffilestream.cpp | 9 +- tests/streams/filestream.cpp | 9 +- tests/streams/memstream.cpp | 9 +- tests/streams/sstream.cpp | 4 +- tests/streams/textstreamtest.cpp | 4 +- tests/streams/zlibstream.cpp | 9 +- tests/strings/crt.cpp | 4 +- tests/strings/stdstrings.cpp | 4 +- tests/strings/strings.cpp | 4 +- tests/strings/unicode.cpp | 4 +- tests/test.bkl | 11 + tests/test.cpp | 11 +- tests/test.dsp | 211 +++++++++--------- tests/test.dsw | 15 ++ tests/testprec.h | 3 + tests/uris/uris.cpp | 4 +- 36 files changed, 318 insertions(+), 269 deletions(-) create mode 100644 tests/dummy.cpp create mode 100644 tests/testprec.h diff --git a/tests/Makefile.in b/tests/Makefile.in index 9f6d9ec19a..8a10025b20 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -36,8 +36,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ DESTDIR = WX_RELEASE = 2.5 LIBDIRNAME = $(top_builddir)lib -TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ - $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) +TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(srcdir) $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ test_test.o \ test_archivetest.o \ @@ -62,8 +62,10 @@ TEST_OBJECTS = \ test_filestream.o \ test_memstream.o \ test_sstream.o \ + test_textstreamtest.o \ test_zlibstream.o \ test_uris.o +TEST_ODEP = $(___pch_testprec_test_testprec_h_gch___depname) ### Conditionally set variables: ### @@ -82,6 +84,9 @@ TEST_OBJECTS = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@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_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) @@ -134,6 +139,9 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__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) + data: @mkdir -p . @for f in testdata.fc; do \ @@ -142,79 +150,82 @@ data: fi; \ done -test_test.o: $(srcdir)/test.cpp +test_test.o: $(srcdir)/test.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< + +test_archivetest.o: $(srcdir)/archive/archivetest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_archivetest.o: $(srcdir)/archive/archivetest.cpp +test_arrays.o: $(srcdir)/arrays/arrays.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_arrays.o: $(srcdir)/arrays/arrays.cpp +test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp +test_fileconftest.o: $(srcdir)/fileconf/fileconftest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_fileconftest.o: $(srcdir)/fileconf/fileconftest.cpp +test_filenametest.o: $(srcdir)/filename/filenametest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_filenametest.o: $(srcdir)/filename/filenametest.cpp +test_filesystest.o: $(srcdir)/filesys/filesystest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_filesystest.o: $(srcdir)/filesys/filesystest.cpp +test_fontmaptest.o: $(srcdir)/fontmap/fontmaptest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_fontmaptest.o: $(srcdir)/fontmap/fontmaptest.cpp +test_formatconvertertest.o: $(srcdir)/formatconverter/formatconvertertest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_formatconvertertest.o: $(srcdir)/formatconverter/formatconvertertest.cpp +test_hashes.o: $(srcdir)/hashes/hashes.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_hashes.o: $(srcdir)/hashes/hashes.cpp +test_longlongtest.o: $(srcdir)/longlong/longlongtest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_longlongtest.o: $(srcdir)/longlong/longlongtest.cpp +test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp +test_regextest.o: $(srcdir)/regex/regextest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_regextest.o: $(srcdir)/regex/regextest.cpp +test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp +test_strings.o: $(srcdir)/strings/strings.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_strings.o: $(srcdir)/strings/strings.cpp +test_stdstrings.o: $(srcdir)/strings/stdstrings.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_stdstrings.o: $(srcdir)/strings/stdstrings.cpp +test_unicode.o: $(srcdir)/strings/unicode.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_unicode.o: $(srcdir)/strings/unicode.cpp +test_crt.o: $(srcdir)/strings/crt.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_crt.o: $(srcdir)/strings/crt.cpp +test_bstream.o: $(srcdir)/streams/bstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_bstream.o: $(srcdir)/streams/bstream.cpp +test_ffilestream.o: $(srcdir)/streams/ffilestream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_ffilestream.o: $(srcdir)/streams/ffilestream.cpp +test_filestream.o: $(srcdir)/streams/filestream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_filestream.o: $(srcdir)/streams/filestream.cpp +test_memstream.o: $(srcdir)/streams/memstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_memstream.o: $(srcdir)/streams/memstream.cpp +test_sstream.o: $(srcdir)/streams/sstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_sstream.o: $(srcdir)/streams/sstream.cpp +test_textstreamtest.o: $(srcdir)/streams/textstreamtest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp +test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< -test_uris.o: $(srcdir)/uris/uris.cpp +test_uris.o: $(srcdir)/uris/uris.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index 476513e4f4..636ef41940 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -7,7 +7,7 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ # pragma hdrstop @@ -25,7 +25,6 @@ #include "wx/mstream.h" #include "wx/wfstream.h" #include "wx/dir.h" -#include "wx/cppunit.h" #include #include #include @@ -104,7 +103,7 @@ class TestEntry { public: TestEntry(const wxDateTime& dt, int len, const char *data); - ~TestEntry() { delete [] m_data; } + ~TestEntry() { delete [] (char*) m_data; } wxDateTime GetDateTime() const { return m_dt; } wxFileOffset GetLength() const { return m_len; } @@ -279,7 +278,7 @@ public: TestInputStream(TestOutputStream& out) : m_data(NULL) { SetData(out); } // this ctor 'dups' TestInputStream(const TestInputStream& in); - ~TestInputStream() { delete [] m_data; } + ~TestInputStream() { delete [] (char*) m_data; } void Rewind(); wxFileOffset GetLength() const { return m_size; } @@ -323,7 +322,7 @@ void TestInputStream::Rewind() void TestInputStream::SetData(TestOutputStream& out) { - delete [] m_data; + delete [] (char*) m_data; m_options = out.GetOptions(); out.GetData(m_data, m_size); Rewind(); @@ -602,21 +601,21 @@ protected: template ArchiveTestCase::ArchiveTestCase(const wxString& name, - int id, - ClassFactoryT *factory, - int options, - const wxString& archiver, - const wxString& unarchiver) - : CppUnit::TestCase(std::string(name.mb_str())), - m_factory(factory), - m_options(options), - m_timeStamp(1, wxDateTime::Mar, 2005, 12, 0), - m_id(id), - m_archiver(archiver), - m_unarchiver(unarchiver) + int id, + typename Classes::ClassFactoryT *factory, + int options, + const wxString& archiver, + const wxString& unarchiver) + : CppUnit::TestCase(std::string(name.mb_str())), + m_factory(factory), + m_options(options), + m_timeStamp(1, wxDateTime::Mar, 2005, 12, 0), + m_id(id), + m_archiver(archiver), + m_unarchiver(unarchiver) { } - + template ArchiveTestCase::~ArchiveTestCase() { diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp index 0e52f865e7..719b266f30 100644 --- a/tests/arrays/arrays.cpp +++ b/tests/arrays/arrays.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -23,8 +23,6 @@ #include "wx/dynarray.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // helpers for testing values and sizes // ---------------------------------------------------------------------------- diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index cc6f081084..fdfe2982c4 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -22,8 +22,6 @@ #include "wx/datetime.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // broken down date representation used for testing // ---------------------------------------------------------------------------- diff --git a/tests/dummy.cpp b/tests/dummy.cpp new file mode 100644 index 0000000000..473a0ceb0e --- /dev/null +++ b/tests/dummy.cpp @@ -0,0 +1,28 @@ +/* + * File: dummy.cc + * Purpose: See below + * Author: Julian Smart + * Created: 1993 + * Updated: + * Copyright: (c) Julian Smart + */ + +/* A dummy file to include wx.h. If precompiling wx.h, I + * always start by compiling this and producing the PCH file. + * Then subsequent source files use the PCH file. + * + * If precompiling wx.h for wxWidgets and derived apps, + * link dummy.obj with your program (the MSC 7 linker complains otherwise). + * + * This is the only convenient way I found to use precompiled headers + * under MSC 7. + * + * This will produce a big PCH file. + */ + +/* RN: MSVC Spits out annoying warnings about debug info - tell it to be quiet! */ +#ifdef _MSC_VER + #pragma warning(disable : 4786) +#endif // _MSC_VER + +#include "testprec.h" \ No newline at end of file diff --git a/tests/fileconf/fileconftest.cpp b/tests/fileconf/fileconftest.cpp index 766e2accaf..a2fb2e61bf 100644 --- a/tests/fileconf/fileconftest.cpp +++ b/tests/fileconf/fileconftest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,9 +24,6 @@ #include "wx/fileconf.h" #include "wx/sstream.h" -#include "wx/wfstream.h" - -#include "wx/cppunit.h" static const wxChar *testconfig = _T("[root]\n") @@ -45,9 +42,7 @@ _T("[root/group2]\n") class FileConfigTestCase : public CppUnit::TestCase { public: - FileConfigTestCase() - { - } + FileConfigTestCase() { } private: CPPUNIT_TEST_SUITE( FileConfigTestCase ); @@ -87,23 +82,9 @@ private: static wxString Dump(wxFileConfig& fc) { - wxFileOutputStream* pOutFile = new wxFileOutputStream(_T("outconf.txt")); - fc.Save(*pOutFile); - delete pOutFile; - - wxFileInputStream* pInFile = new wxFileInputStream(_T("outconf.txt")); - char* szOut = new char[pInFile->GetSize()]; - pInFile->Read(szOut, pInFile->GetSize()); - - wxString realString = wxTextFile::Translate( - wxString(szOut, wxConvLocal, pInFile->GetSize()), - wxTextFileType_Unix - ); - - delete szOut; - delete pInFile; - - return realString; + wxStringOutputStream sos; + fc.Save(sos); + return wxTextFile::Translate(sos.GetString(), wxTextFileType_Unix); } void CheckGroupEntries(const wxFileConfig& fc, diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index 1a495e7add..25ffc3be01 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -22,8 +22,6 @@ #include "wx/filename.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test data // ---------------------------------------------------------------------------- diff --git a/tests/filesys/filesystest.cpp b/tests/filesys/filesystest.cpp index 90ade21d31..fa928db128 100644 --- a/tests/filesys/filesystest.cpp +++ b/tests/filesys/filesystest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -23,8 +23,6 @@ #include "wx/filesys.h" -#include "wx/cppunit.h" - #if wxUSE_FILESYSTEM // ---------------------------------------------------------------------------- diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp index b267f0d04e..212f64c434 100644 --- a/tests/fontmap/fontmaptest.cpp +++ b/tests/fontmap/fontmaptest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -25,8 +25,6 @@ #include "wx/fontmap.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- diff --git a/tests/formatconverter/formatconvertertest.cpp b/tests/formatconverter/formatconvertertest.cpp index aa924fe9f4..987a69e862 100644 --- a/tests/formatconverter/formatconvertertest.cpp +++ b/tests/formatconverter/formatconvertertest.cpp @@ -36,7 +36,7 @@ // // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -47,8 +47,6 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" - // wxFormatConverter can only be tested in a Unicode non-Windows debug build // #if defined(wxNEED_PRINTF_CONVERSION) && defined(__WXDEBUG__) diff --git a/tests/hashes/hashes.cpp b/tests/hashes/hashes.cpp index fa0c2064ef..062822fedd 100644 --- a/tests/hashes/hashes.cpp +++ b/tests/hashes/hashes.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -25,8 +25,6 @@ #include "wx/hashmap.h" #include "wx/hashset.h" -#include "wx/cppunit.h" - // -------------------------------------------------------------------------- // helper class for typed/untyped wxHashTable // -------------------------------------------------------------------------- diff --git a/tests/longlong/longlongtest.cpp b/tests/longlong/longlongtest.cpp index 93ef095150..f93030996a 100644 --- a/tests/longlong/longlongtest.cpp +++ b/tests/longlong/longlongtest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,8 +24,6 @@ #include "wx/longlong.h" #include "wx/timer.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // helpers for testing // ---------------------------------------------------------------------------- diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 34a35c765d..37b4b2764a 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -29,9 +29,12 @@ SETUPHDIR = \ TEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -I. \ - $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) + $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test.csm \ + $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ + $(OBJS)\test_dummy.obj \ $(OBJS)\test_test.obj \ + $(OBJS)\test_archivetest.obj \ $(OBJS)\test_arrays.obj \ $(OBJS)\test_datetimetest.obj \ $(OBJS)\test_fileconftest.obj \ @@ -53,6 +56,7 @@ TEST_OBJECTS = \ $(OBJS)\test_filestream.obj \ $(OBJS)\test_memstream.obj \ $(OBJS)\test_sstream.obj \ + $(OBJS)\test_textstreamtest.obj \ $(OBJS)\test_zlibstream.obj \ $(OBJS)\test_uris.obj @@ -180,7 +184,7 @@ clean: -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf -if exist $(OBJS)\test.ils del $(OBJS)\test.ils -$(OBJS)\test.exe: $(TEST_OBJECTS) +$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&| c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | @@ -189,9 +193,15 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\test_dummy.obj: .\dummy.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) -H $** + $(OBJS)\test_test.obj: .\test.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** @@ -255,6 +265,9 @@ $(OBJS)\test_memstream.obj: .\streams\memstream.cpp $(OBJS)\test_sstream.obj: .\streams\sstream.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 4a2429c528..f9f51084b7 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -22,7 +22,9 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ -I.\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) \ $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ + $(OBJS)\test_dummy.o \ $(OBJS)\test_test.o \ + $(OBJS)\test_archivetest.o \ $(OBJS)\test_arrays.o \ $(OBJS)\test_datetimetest.o \ $(OBJS)\test_fileconftest.o \ @@ -44,6 +46,7 @@ TEST_OBJECTS = \ $(OBJS)\test_filestream.o \ $(OBJS)\test_memstream.o \ $(OBJS)\test_sstream.o \ + $(OBJS)\test_textstreamtest.o \ $(OBJS)\test_zlibstream.o \ $(OBJS)\test_uris.o @@ -183,9 +186,15 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\test_dummy.o: ./dummy.cpp + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< + $(OBJS)\test_test.o: ./test.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< +$(OBJS)\test_archivetest.o: ./archive/archivetest.cpp + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< + $(OBJS)\test_arrays.o: ./arrays/arrays.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< @@ -249,6 +258,9 @@ $(OBJS)\test_memstream.o: ./streams/memstream.cpp $(OBJS)\test_sstream.o: ./streams/sstream.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< +$(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< + $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index c9795925d4..5af3ea70b4 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -22,9 +22,12 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\include /I$(SETUPHDIR) /W4 \ /I. $(__DLLFLAG_p) /D_CONSOLE $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_9) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" \ + $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ + $(OBJS)\test_dummy.obj \ $(OBJS)\test_test.obj \ + $(OBJS)\test_archivetest.obj \ $(OBJS)\test_arrays.obj \ $(OBJS)\test_datetimetest.obj \ $(OBJS)\test_fileconftest.obj \ @@ -46,6 +49,7 @@ TEST_OBJECTS = \ $(OBJS)\test_filestream.obj \ $(OBJS)\test_memstream.obj \ $(OBJS)\test_sstream.obj \ + $(OBJS)\test_textstreamtest.obj \ $(OBJS)\test_zlibstream.obj \ $(OBJS)\test_uris.obj @@ -236,7 +240,7 @@ clean: -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb -$(OBJS)\test.exe: $(TEST_OBJECTS) +$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<< $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib << @@ -245,9 +249,15 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\test_dummy.obj: .\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) /Yctestprec.h $** + $(OBJS)\test_test.obj: .\test.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** @@ -311,6 +321,9 @@ $(OBJS)\test_memstream.obj: .\streams\memstream.cpp $(OBJS)\test_sstream.obj: .\streams\sstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** diff --git a/tests/makefile.wat b/tests/makefile.wat index 86f1ce7c32..be02b7a095 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -182,10 +182,13 @@ SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) 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) -wcd=549 -wcd=656 -wcd=657 -i=. $(__DLLFLAG_p) & - $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) + -i=.\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & + $(OBJS)\test_dummy.obj & $(OBJS)\test_test.obj & + $(OBJS)\test_archivetest.obj & $(OBJS)\test_arrays.obj & $(OBJS)\test_datetimetest.obj & $(OBJS)\test_fileconftest.obj & @@ -207,6 +210,7 @@ TEST_OBJECTS = & $(OBJS)\test_filestream.obj & $(OBJS)\test_memstream.obj & $(OBJS)\test_sstream.obj & + $(OBJS)\test_textstreamtest.obj & $(OBJS)\test_zlibstream.obj & $(OBJS)\test_uris.obj @@ -241,9 +245,15 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\test_dummy.obj : .AUTODEPEND .\dummy.cpp + $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< +$(OBJS)\test_archivetest.obj : .AUTODEPEND .\archive\archivetest.cpp + $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(OBJS)\test_arrays.obj : .AUTODEPEND .\arrays\arrays.cpp $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< @@ -307,6 +317,9 @@ $(OBJS)\test_memstream.obj : .AUTODEPEND .\streams\memstream.cpp $(OBJS)\test_sstream.obj : .AUTODEPEND .\streams\sstream.cpp $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< +$(OBJS)\test_textstreamtest.obj : .AUTODEPEND .\streams\textstreamtest.cpp + $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(OBJS)\test_zlibstream.obj : .AUTODEPEND .\streams\zlibstream.cpp $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< diff --git a/tests/mbconv/mbconvtest.cpp b/tests/mbconv/mbconvtest.cpp index 6c509c838d..8bb3fd878e 100644 --- a/tests/mbconv/mbconvtest.cpp +++ b/tests/mbconv/mbconvtest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,8 +24,6 @@ #include "wx/strconv.h" #include "wx/string.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp index 5b890d2d86..c146caf672 100644 --- a/tests/regex/regextest.cpp +++ b/tests/regex/regextest.cpp @@ -30,7 +30,7 @@ // // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -48,7 +48,6 @@ #ifdef wxHAS_REGEX_ADVANCED #include "wx/regex.h" -#include "wx/cppunit.h" #include #include @@ -133,6 +132,7 @@ RegExTestCase::RegExTestCase( m_advanced(false) { bool badconv = m_pattern == convError() || m_data == convError(); + //RN: Removing the std:: here will break MSVC6 compilation std::vector::const_iterator it; for (it = expected.begin(); it != expected.end(); ++it) { diff --git a/tests/regex/wxregextest.cpp b/tests/regex/wxregextest.cpp index ee16ff81df..7d7b3085b9 100644 --- a/tests/regex/wxregextest.cpp +++ b/tests/regex/wxregextest.cpp @@ -7,7 +7,7 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ # pragma hdrstop @@ -20,7 +20,6 @@ #if wxUSE_REGEX #include "wx/regex.h" -#include "wx/cppunit.h" #include "wx/tokenzr.h" #include diff --git a/tests/streams/bstream.cpp b/tests/streams/bstream.cpp index d03458ef28..5a5076bb2f 100644 --- a/tests/streams/bstream.cpp +++ b/tests/streams/bstream.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,7 +20,6 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" #include "bstream.h" using CppUnit::TestSuite; diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp index 134830530e..17a4e95ece 100644 --- a/tests/streams/ffilestream.cpp +++ b/tests/streams/ffilestream.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,7 +20,6 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" #include "wx/wfstream.h" #include "bstream.h" diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp index ae005e25b1..ccec25fd47 100644 --- a/tests/streams/filestream.cpp +++ b/tests/streams/filestream.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,7 +20,6 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" #include "wx/wfstream.h" #include "bstream.h" diff --git a/tests/streams/memstream.cpp b/tests/streams/memstream.cpp index 6c5a602271..7dee2c224e 100644 --- a/tests/streams/memstream.cpp +++ b/tests/streams/memstream.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,7 +20,6 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" #include "wx/mstream.h" #include "bstream.h" diff --git a/tests/streams/sstream.cpp b/tests/streams/sstream.cpp index 20dfd40b5e..49fbf32456 100644 --- a/tests/streams/sstream.cpp +++ b/tests/streams/sstream.cpp @@ -8,7 +8,8 @@ /////////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -18,7 +19,6 @@ #ifndef WX_PRECOMP #endif -#include "wx/cppunit.h" #include "wx/sstream.h" #include "bstream.h" diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp index 54bcf3fd82..6139092965 100644 --- a/tests/streams/textstreamtest.cpp +++ b/tests/streams/textstreamtest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,8 +24,6 @@ #include "wx/txtstrm.h" #include "wx/wfstream.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp index 6f65cf1089..30a87ee618 100644 --- a/tests/streams/zlibstream.cpp +++ b/tests/streams/zlibstream.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,7 +20,6 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" #include "wx/zstream.h" #include "wx/wfstream.h" #include "wx/mstream.h" diff --git a/tests/strings/crt.cpp b/tests/strings/crt.cpp index a056270c18..6d44655dd2 100644 --- a/tests/strings/crt.cpp +++ b/tests/strings/crt.cpp @@ -12,7 +12,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,8 +24,6 @@ #include "wx/textfile.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp index ded78080c4..3f13eb6386 100644 --- a/tests/strings/stdstrings.cpp +++ b/tests/strings/stdstrings.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -21,8 +21,6 @@ #include "wx/wx.h" #endif // WX_PRECOMP -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index a17c815519..8b1c6235b6 100644 --- a/tests/strings/strings.cpp +++ b/tests/strings/strings.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -23,8 +23,6 @@ #include "wx/tokenzr.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp index bcf6a6060a..1b49421a5c 100644 --- a/tests/strings/unicode.cpp +++ b/tests/strings/unicode.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -23,8 +23,6 @@ #include "wx/textfile.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- diff --git a/tests/test.bkl b/tests/test.bkl index 65c8391c83..c0c396faeb 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -7,6 +7,17 @@ + + + + dummy.cpp + dummy.cpp + + testprec.h + on + testprec_$(id) + + test.cpp archive/archivetest.cpp diff --git a/tests/test.cpp b/tests/test.cpp index c503886511..7c63b439a3 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// For compilers that support precompilation, includes "wx/wx.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -25,7 +21,6 @@ #endif #include "wx/cmdline.h" -#include "wx/cppunit.h" #include using CppUnit::Test; diff --git a/tests/test.dsp b/tests/test.dsp index 36cbbfa338..5767e25411 100644 --- a/tests/test.dsp +++ b/tests/test.dsp @@ -54,16 +54,16 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\mswunivu" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivudll\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\mswunivu" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivudll\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswunivu" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswunivu" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 DLL Universal Unicode Debug" @@ -77,16 +77,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivuddll" # PROP Intermediate_Dir "vc_mswunivuddll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswunivud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivuddll\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswunivud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivuddll\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswunivud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswunivud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 DLL Universal Release" @@ -100,16 +100,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivdll" # PROP Intermediate_Dir "vc_mswunivdll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\mswuniv" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivdll\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\mswuniv" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivdll\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswuniv" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswuniv" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswuniv" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivdll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswuniv" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivdll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 DLL Universal Debug" @@ -123,16 +123,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivddll" # PROP Intermediate_Dir "vc_mswunivddll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswunivd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivddll\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswunivd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswunivddll\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswunivd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswunivd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 DLL Unicode Release" @@ -146,16 +146,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\mswu" /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswudll\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\mswu" /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswudll\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswu" /i "." /d "__WXMSW__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswu" /i "." /d "__WXMSW__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswudll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 DLL Unicode Debug" @@ -169,16 +169,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswuddll" # PROP Intermediate_Dir "vc_mswuddll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswuddll\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswuddll\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 DLL Release" @@ -192,16 +192,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswdll" # PROP Intermediate_Dir "vc_mswdll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\msw" /I "." /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswdll\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_dll\msw" /I "." /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswdll\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\msw" /i "." /d "__WXMSW__" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\msw" /i "." /d "__WXMSW__" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\msw" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswdll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswdll\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\msw" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswdll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\test.exe" /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 DLL Debug" @@ -215,16 +215,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswddll" # PROP Intermediate_Dir "vc_mswddll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswddll\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_dll\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /Fd"vc_mswddll\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_dll\mswd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswddll\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" -# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_dll" +# ADD BASE LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\test.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Universal Unicode Release" @@ -238,16 +238,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\mswunivu" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswunivu\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\mswunivu" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswunivu\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswunivu" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswunivu" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivu" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivu" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Universal Unicode Debug" @@ -261,16 +261,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivud" # PROP Intermediate_Dir "vc_mswunivud\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswunivud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswunivud\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswunivud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswunivud\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswunivud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswunivud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivud" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivud" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Universal Release" @@ -284,16 +284,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswuniv" # PROP Intermediate_Dir "vc_mswuniv\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\mswuniv" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /Fd"vc_mswuniv\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\mswuniv" /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /Fd"vc_mswuniv\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswuniv" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswuniv" /i "." /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswuniv" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuniv\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswuniv" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuniv\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_lib\mswuniv" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_lib\mswuniv" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Universal Debug" @@ -307,16 +307,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivd" # PROP Intermediate_Dir "vc_mswunivd\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswunivd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswunivd\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswunivd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswunivd\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswunivd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswunivd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivd\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivd\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivd" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivd" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Unicode Release" @@ -330,16 +330,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\mswu" /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswu\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\mswu" /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswu\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswu" /i "." /d "__WXMSW__" /d "_UNICODE" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswu" /i "." /d "__WXMSW__" /d "_UNICODE" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswu\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswu" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswu" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswu" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25u_net.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Unicode Debug" @@ -353,16 +353,16 @@ LINK32=link.exe # PROP Output_Dir "vc_mswud" # PROP Intermediate_Dir "vc_mswud\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswud\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswud" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /Fd"vc_mswud\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswud" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswud" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswud" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswud" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25ud_net.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Release" @@ -376,16 +376,16 @@ LINK32=link.exe # PROP Output_Dir "vc_msw" # PROP Intermediate_Dir "vc_msw\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\msw" /I "." /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /Fd"vc_msw\test.pdb" /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O1 /I ".\..\include" /I ".\..\lib\vc_lib\msw" /I "." /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /Fd"vc_msw\test.pdb" /FD /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\msw" /i "." /d "__WXMSW__" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\msw" /i "." /d "__WXMSW__" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\msw" /W4 /I "." /Yu"testprec.h" /Fp"vc_msw\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Fdvc_msw\test.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\msw" /W4 /I "." /Yu"testprec.h" /Fp"vc_msw\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_lib\msw" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_lib\msw" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25_net.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\test.exe" /libpath:".\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "test - Win32 Debug" @@ -399,18 +399,18 @@ LINK32=link.exe # PROP Output_Dir "vc_mswd" # PROP Intermediate_Dir "vc_mswd\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswd\test.pdb" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswd\test.pdb" /FD /GZ /c -# ADD BASE RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_CONSOLE" -# ADD RSC /l 0x405 /i ".\..\include" /i ".\..\lib\vc_lib\mswd" /i "." /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_CONSOLE" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswd\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswd\testprec_test.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /c +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswd" /i "." /d _CONSOLE +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswd" /i "." /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" -# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" +# ADD BASE LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase25d_net.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\test.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:console -!ENDIF +!ENDIF # Begin Target @@ -435,15 +435,15 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\arrays\arrays.cpp +SOURCE=.\archive\archivetest.cpp # End Source File # Begin Source File -SOURCE=.\streams\bstream.cpp +SOURCE=.\arrays\arrays.cpp # End Source File # Begin Source File -SOURCE=.\streams\bstream.h +SOURCE=.\streams\bstream.cpp # End Source File # Begin Source File @@ -455,6 +455,12 @@ SOURCE=.\datetime\datetimetest.cpp # End Source File # Begin Source File +SOURCE=.\dummy.cpp +# ADD BASE CPP /Yc"testprec.h" +# ADD CPP /Yc"testprec.h" +# End Source File +# Begin Source File + SOURCE=.\streams\ffilestream.cpp # End Source File # Begin Source File @@ -519,6 +525,10 @@ SOURCE=.\test.cpp # End Source File # Begin Source File +SOURCE=.\streams\textstreamtest.cpp +# End Source File +# Begin Source File + SOURCE=.\strings\unicode.cpp # End Source File # Begin Source File @@ -536,3 +546,4 @@ SOURCE=.\streams\zlibstream.cpp # End Group # End Target # End Project + diff --git a/tests/test.dsw b/tests/test.dsw index 9cd6ef6883..1aca67e163 100644 --- a/tests/test.dsw +++ b/tests/test.dsw @@ -11,12 +11,27 @@ Package=<5> Package=<4> {{{ Begin Project Dependency +Project_Dep_Name net +End Project Dependency +Begin Project Dependency Project_Dep_Name base End Project Dependency }}} ############################################################################### +Project: "net"=..\build\msw\wx_net.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "base"=..\build\msw\wx_base.dsp - Package Owner=<4> Package=<5> diff --git a/tests/testprec.h b/tests/testprec.h new file mode 100644 index 0000000000..776407794f --- /dev/null +++ b/tests/testprec.h @@ -0,0 +1,3 @@ + +#include "wx/wxprec.h" +#include "wx/cppunit.h" diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp index 3286c3d338..193beca20a 100644 --- a/tests/uris/uris.cpp +++ b/tests/uris/uris.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,8 +24,6 @@ #include "wx/uri.h" #include "wx/url.h" -#include "wx/cppunit.h" - // Test wxURL & wxURI compat? #define TEST_URL ( 0 && wxUSE_URL ) -- 2.45.2