]> git.saurik.com Git - wxWidgets.git/blobdiff - tests/makefile.vc
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
removed msw.xp-tab-ok, in fact it is not needed as tabs never work correctly with...
[wxWidgets.git] / tests / makefile.vc
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 88a81a75d24cee1a4c82d4e08f0ebde7daf5c54f..5af3ea70b4860975442cfdfbe303914eea4c6cbe 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -12,6 +12,7 @@
 
 ### Variables: ###
 
+WX_RELEASE_NODOT = 25
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
@@ -21,17 +22,24 @@ 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_main.obj \
-       $(OBJS)\test_formatconverter.obj \
-       $(OBJS)\test_regex.obj \
-       $(OBJS)\test_wxregex.obj \
-       $(OBJS)\test_filesys.obj \
+       $(OBJS)\test_archivetest.obj \
        $(OBJS)\test_arrays.obj \
+       $(OBJS)\test_datetimetest.obj \
+       $(OBJS)\test_fileconftest.obj \
+       $(OBJS)\test_filenametest.obj \
+       $(OBJS)\test_filesystest.obj \
+       $(OBJS)\test_fontmaptest.obj \
+       $(OBJS)\test_formatconvertertest.obj \
        $(OBJS)\test_hashes.obj \
-       $(OBJS)\test_longlong.obj \
+       $(OBJS)\test_longlongtest.obj \
+       $(OBJS)\test_mbconvtest.obj \
+       $(OBJS)\test_regextest.obj \
+       $(OBJS)\test_wxregextest.obj \
        $(OBJS)\test_strings.obj \
        $(OBJS)\test_stdstrings.obj \
        $(OBJS)\test_unicode.obj \
@@ -40,8 +48,10 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ffilestream.obj \
        $(OBJS)\test_filestream.obj \
        $(OBJS)\test_memstream.obj \
+       $(OBJS)\test_sstream.obj \
+       $(OBJS)\test_textstreamtest.obj \
        $(OBJS)\test_zlibstream.obj \
-       $(OBJS)\test_fontmap.obj
+       $(OBJS)\test_uris.obj
 
 ### Conditionally set variables: ###
 
@@ -66,6 +76,12 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_0 = /Zi
 !endif
@@ -178,11 +194,16 @@ __UNICODE_DEFINE_p = /D_UNICODE
 __DLLFLAG_p = /DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -219,40 +240,58 @@ 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_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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
+       $(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
 <<
 
 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_main.obj: .\mbconv\main.cpp
+$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_formatconverter.obj: .\formatconverter\formatconverter.cpp
+$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_regex.obj: .\regex\regex.cpp
+$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp
+$(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_filesys.obj: .\filesys\filesys.cpp
+$(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
+$(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_longlong.obj: .\longlong\longlong.cpp
+$(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_regextest.obj: .\regex\regextest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_strings.obj: .\strings\strings.cpp
@@ -279,8 +318,14 @@ $(OBJS)\test_filestream.obj: .\streams\filestream.cpp
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(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) $**
 
-$(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp
+$(OBJS)\test_uris.obj: .\uris\uris.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
wxWidgets (Impactor)