support wxFD_MULTIPLE

[wxWidgets.git] / tests / makefile.vc

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 93d4d49811f5996de79f59661014d2fd31cb180e..19f365c0ad48b00c7b180cfad1f12254093078d9 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -190,12 +190,13 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_guifuncs.obj \\r
        $(OBJS)\test_gui_selstoretest.obj \\r
        $(OBJS)\test_gui_garbage.obj \\r
-       $(OBJS)\test_gui_settings.obj \\r
-       $(OBJS)\test_gui_socket.obj \\r
-       $(OBJS)\test_gui_boxsizer.obj \\r
-       $(OBJS)\test_gui_valnum.obj \\r
-       $(OBJS)\test_gui_clientsize.obj \\r
-       $(OBJS)\test_gui_setsize.obj \\r
+       $(OBJS)\test_gui_settings.obj \
+       $(OBJS)\test_gui_socket.obj \
+       $(OBJS)\test_gui_boxsizer.obj \
+       $(OBJS)\test_gui_wrapsizer.obj \
+       $(OBJS)\test_gui_valnum.obj \
+       $(OBJS)\test_gui_clientsize.obj \
+       $(OBJS)\test_gui_setsize.obj \
        $(OBJS)\test_gui_xrctest.obj\r
 TEST_GUI_RESOURCES =  \\r
        $(OBJS)\test_gui_sample.res\r
@@ -277,6 +278,9 @@ __RUNTIME_LIBS_10 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_10 = $(__THREADSFLAG)\r
 !endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
 !if "$(USE_GUI)" == "1"\r
 __test_gui___depname = $(OBJS)\test_gui.exe\r
 !endif\r
@@ -382,9 +386,6 @@ __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"\r
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
 !endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 __DEBUGINFO = /Zi\r
 !endif\r
@@ -527,6 +528,9 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
@@ -559,7 +563,7 @@ clean:
 \r
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(TEST_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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 wininet.lib\r
+       $(TEST_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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 wininet.lib\r
 <<\r
 \r
 !if "$(USE_GUI)" == "1"\r
@@ -1036,12 +1040,15 @@ $(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj: .\net\socket.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp\r
 \r
-$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp\r
-\r
-$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp\r
-\r
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp\r
 \r