$(OBJS)\test_gui_colour.obj \\r
$(OBJS)\test_gui_ellipsization.obj \\r
$(OBJS)\test_gui_measuring.obj \\r
+ $(OBJS)\test_gui_affinematrix.obj \\r
$(OBJS)\test_gui_config.obj \\r
$(OBJS)\test_gui_bitmapcomboboxtest.obj \\r
$(OBJS)\test_gui_bitmaptogglebuttontest.obj \\r
$(OBJS)\test_gui_choicebooktest.obj \\r
$(OBJS)\test_gui_choicetest.obj \\r
$(OBJS)\test_gui_comboboxtest.obj \\r
+ $(OBJS)\test_gui_datepickerctrltest.obj \\r
$(OBJS)\test_gui_frametest.obj \\r
$(OBJS)\test_gui_gaugetest.obj \\r
$(OBJS)\test_gui_gridtest.obj \\r
$(OBJS)\test_gui_listboxtest.obj \\r
$(OBJS)\test_gui_listctrltest.obj \\r
$(OBJS)\test_gui_listviewtest.obj \\r
+ $(OBJS)\test_gui_markuptest.obj \\r
$(OBJS)\test_gui_notebooktest.obj \\r
$(OBJS)\test_gui_ownerdrawncomboboxtest.obj \\r
$(OBJS)\test_gui_pickerbasetest.obj \\r
$(OBJS)\test_gui_settings.obj \\r
$(OBJS)\test_gui_socket.obj \\r
$(OBJS)\test_gui_boxsizer.obj \\r
+ $(OBJS)\test_gui_wrapsizer.obj \\r
+ $(OBJS)\test_gui_toplevel.obj \\r
$(OBJS)\test_gui_valnum.obj \\r
$(OBJS)\test_gui_clientsize.obj \\r
$(OBJS)\test_gui_setsize.obj \\r
!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
!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
__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
\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
$(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
\r
+$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp\r
+\r
$(OBJS)\test_gui_config.obj: .\config\config.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp\r
\r
$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp\r
\r
+$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp\r
+\r
$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp\r
\r
$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp\r
\r
+$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp\r
+\r
$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.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_wrapsizer.obj: .\sizers\wrapsizer.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp\r
+\r
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.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