# =========================================================================\r
# This makefile was generated by\r
-# Bakefile 0.2.8 (http://www.bakefile.org)\r
+# Bakefile 0.2.9 (http://www.bakefile.org)\r
# Do not modify, all changes will be overwritten!\r
# =========================================================================\r
\r
!ifeq MONOLITHIC 1\r
EXTRALIBS_FOR_BASE = \r
!endif\r
+__LIB_PNG_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
__test_gui___depname =\r
!ifeq USE_GUI 1\r
__test_gui___depname = $(OBJS)\test_gui.exe\r
!ifeq USE_GUI 1\r
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
__DEBUGINFO =\r
!ifeq BUILD debug\r
!ifeq DEBUG_INFO default\r
__WXLIB_MONO_p = &\r
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
!endif\r
+__LIB_PNG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
__CAIRO_LIB_p =\r
!ifeq USE_CAIRO 1\r
__CAIRO_LIB_p = cairo.lib\r
$(OBJS)\test_wxregextest.obj &\r
$(OBJS)\test_scopeguardtest.obj &\r
$(OBJS)\test_iostream.obj &\r
+ $(OBJS)\test_numformatter.obj &\r
$(OBJS)\test_strings.obj &\r
$(OBJS)\test_stdstrings.obj &\r
$(OBJS)\test_tokenizer.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 &
$(OBJS)\test_gui_notebooktest.obj &\r
$(OBJS)\test_gui_ownerdrawncomboboxtest.obj &\r
$(OBJS)\test_gui_pickerbasetest.obj &\r
$(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_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
\r
\r
@%append $(OBJS)\test.lbc option caseexact\r
@%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
@for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i\r
- @for %i in ( $(__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) $(__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) do @%append $(OBJS)\test.lbc library %i\r
+ @for %i in ( $(__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) $(__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) do @%append $(OBJS)\test.lbc library %i\r
@%append $(OBJS)\test.lbc\r
@for %i in () do @%append $(OBJS)\test.lbc option stack=%i\r
wlink @$(OBJS)\test.lbc\r
$(OBJS)\test_iostream.obj : .AUTODEPEND .\strings\iostream.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
\r
+$(OBJS)\test_numformatter.obj : .AUTODEPEND .\strings\numformatter.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
$(OBJS)\test_strings.obj : .AUTODEPEND .\strings\strings.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_listviewtest.obj : .AUTODEPEND .\controls\listviewtest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_markuptest.obj : .AUTODEPEND .\controls\markuptest.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
$(OBJS)\test_gui_notebooktest.obj : .AUTODEPEND .\controls\notebooktest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_socket.obj : .AUTODEPEND .\net\socket.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
-$(OBJS)\test_gui_boxsizer.obj : .AUTODEPEND .\sizers\boxsizer.cpp\r
- $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
-\r
+$(OBJS)\test_gui_boxsizer.obj : .AUTODEPEND .\sizers\boxsizer.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_wrapsizer.obj : .AUTODEPEND .\sizers\wrapsizer.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_valnum.obj : .AUTODEPEND .\validators\valnum.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
$(OBJS)\test_gui_clientsize.obj : .AUTODEPEND .\window\clientsize.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r