32/64 bit universal builds support

[wxWidgets.git] / tests / makefile.vc

diff --git a/tests/makefile.vc b/tests/makefile.vc
index e7b7ebde77ca51beec3b1b2b5946d58708e2a5a0..8f4f4627306310c981b8d4a4c0d2263603406d45 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -36,6 +36,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_tartest.obj \
        $(OBJS)\test_arrays.obj \
        $(OBJS)\test_base64.obj \
+       $(OBJS)\test_cmdlinetest.obj \
        $(OBJS)\test_fileconf.obj \
        $(OBJS)\test_datetimetest.obj \
        $(OBJS)\test_filekind.obj \
@@ -49,6 +50,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_longlongtest.obj \
        $(OBJS)\test_convautotest.obj \
        $(OBJS)\test_mbconvtest.obj \
+       $(OBJS)\test_misctests.obj \
+       $(OBJS)\test_ipc.obj \
        $(OBJS)\test_regextest.obj \
        $(OBJS)\test_wxregextest.obj \
        $(OBJS)\test_scopeguardtest.obj \
@@ -66,8 +69,10 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ffilestream.obj \
        $(OBJS)\test_fileback.obj \
        $(OBJS)\test_filestream.obj \
+       $(OBJS)\test_iostreams.obj \
        $(OBJS)\test_largefile.obj \
        $(OBJS)\test_memstream.obj \
+       $(OBJS)\test_socketstream.obj \
        $(OBJS)\test_sstream.obj \
        $(OBJS)\test_tempfile.obj \
        $(OBJS)\test_textstreamtest.obj \
@@ -75,6 +80,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_textfiletest.obj \
        $(OBJS)\test_atomic.obj \
        $(OBJS)\test_queue.obj \
+       $(OBJS)\test_tls.obj \
        $(OBJS)\test_uris.obj \
        $(OBJS)\test_vectors.obj \
        $(OBJS)\test_evtconnection.obj \
@@ -98,8 +104,11 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_size.obj \
        $(OBJS)\test_gui_point.obj \
        $(OBJS)\test_gui_config.obj \
+       $(OBJS)\test_gui_textctrltest.obj \
+       $(OBJS)\test_gui_rawbmp.obj \
+       $(OBJS)\test_gui_selstoretest.obj \
        $(OBJS)\test_gui_clientsize.obj \
-       $(OBJS)\test_gui_textctrltest.obj
+       $(OBJS)\test_gui_setsize.obj
 PRINTFBENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_38)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) /Fd$(OBJS)\printfbench.pdb $(____DEBUGRUNTIME) \
        $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -415,13 +424,13 @@ clean:
        -if exist $(OBJS)\printfbench.pdb del $(OBJS)\printfbench.pdb
 
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\test.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_2) /pdb:"$(OBJS)\test.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<<
        $(TEST_OBJECTS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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
 <<
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\test_gui.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_2) /pdb:"$(OBJS)\test_gui.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
        $(TEST_GUI_OBJECTS)  $(__WXLIB_CORE_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) $(__GDIPLUS_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
 <<
 !endif
@@ -435,7 +444,7 @@ fr:
        for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
 
 $(OBJS)\printfbench.exe: $(OBJS)\printfbench_dummy.obj  $(PRINTFBENCH_OBJECTS)
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\printfbench.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_2) /pdb:"$(OBJS)\printfbench.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<<
        $(PRINTFBENCH_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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
 <<
 
@@ -460,6 +469,9 @@ $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
 $(OBJS)\test_base64.obj: .\base64\base64.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
 
+$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
+
 $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
 
@@ -499,6 +511,12 @@ $(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
 $(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\mbconv\mbconvtest.cpp
 
+$(OBJS)\test_misctests.obj: .\misc\misctests.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\misctests.cpp
+
+$(OBJS)\test_ipc.obj: .\net\ipc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\net\ipc.cpp
+
 $(OBJS)\test_regextest.obj: .\regex\regextest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\regex\regextest.cpp
 
@@ -550,12 +568,18 @@ $(OBJS)\test_fileback.obj: .\streams\fileback.cpp
 $(OBJS)\test_filestream.obj: .\streams\filestream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\filestream.cpp
 
+$(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\iostreams.cpp
+
 $(OBJS)\test_largefile.obj: .\streams\largefile.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
 
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
 
+$(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\socketstream.cpp
+
 $(OBJS)\test_sstream.obj: .\streams\sstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\sstream.cpp
 
@@ -577,6 +601,9 @@ $(OBJS)\test_atomic.obj: .\thread\atomic.cpp
 $(OBJS)\test_queue.obj: .\thread\queue.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\queue.cpp
 
+$(OBJS)\test_tls.obj: .\thread\tls.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\tls.cpp
+
 $(OBJS)\test_uris.obj: .\uris\uris.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\uris.cpp
 
@@ -616,12 +643,21 @@ $(OBJS)\test_gui_point.obj: .\geometry\point.cpp
 $(OBJS)\test_gui_config.obj: .\config\config.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
 
-$(OBJS)\test_gui_clientsize.obj: .\controls\clientsize.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\clientsize.cpp
-
 $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
 
+$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
+
+$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
+
+$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
+
+$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
+
 $(OBJS)\printfbench_dummy.obj: .\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PRINTFBENCH_CXXFLAGS) /Yctestprec.h .\dummy.cpp