WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = bcc\r
OBJS = \\r
- $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
$(OBJS)\test_gui_rect.obj \\r
$(OBJS)\test_gui_size.obj \\r
$(OBJS)\test_gui_point.obj \\r
+ $(OBJS)\test_gui_region.obj \\r
$(OBJS)\test_gui_bitmap.obj \\r
$(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_dataviewctrltest.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_toolbooktest.obj \\r
$(OBJS)\test_gui_treebooktest.obj \\r
$(OBJS)\test_gui_treectrltest.obj \\r
+ $(OBJS)\test_gui_treelistctrltest.obj \\r
$(OBJS)\test_gui_virtlistctrltest.obj \\r
+ $(OBJS)\test_gui_webtest.obj \\r
$(OBJS)\test_gui_windowtest.obj \\r
$(OBJS)\test_gui_clone.obj \\r
$(OBJS)\test_gui_propagation.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 "$(USE_GUI)" == "1"\r
PORTNAME = msw\r
!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
!if "$(BUILD)" == "debug"\r
WXDEBUGFLAG = d\r
!endif\r
EXTRALIBS_FOR_BASE = \r
!endif\r
!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE = \r
+EXTRALIBS_FOR_BASE = \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
!if "$(SHARED)" == "1"\r
__DLLFLAG_p_3 = -dWXUSINGDLL\r
!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"\r
+__WXLIB_WEBVIEW_p = \\r
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+!endif\r
!if "$(MONOLITHIC)" == "0"\r
__WXLIB_RICHTEXT_p = \\r
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\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"\r
__OPTIMIZEFLAG = -Od\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
### Targets: ###\r
\r
-all: $(OBJS)\test.exe $(__test_gui___depname) data fr\r
+all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr\r
\r
clean: \r
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
\r
$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)\r
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
- c0x32.obj $(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) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,\r
+ c0x32.obj $(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) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,\r
|\r
\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res\r
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
- c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res\r
+ c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res\r
|\r
!endif\r
\r
if not exist $(OBJS) mkdir $(OBJS)\r
for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
\r
+data-images: \r
+ if not exist image mkdir image\r
+ for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%f copy .\image\%f image\r
+\r
fr: \r
if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr\r
for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr\r
$(OBJS)\test_gui_point.obj: .\geometry\point.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp\r
\r
+$(OBJS)\test_gui_region.obj: .\geometry\region.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp\r
+\r
$(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp\r
\r
$(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
\r
+$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp\r
+\r
$(OBJS)\test_gui_config.obj: .\config\config.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp\r
\r
$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp\r
\r
+$(OBJS)\test_gui_dataviewctrltest.obj: .\controls\dataviewctrltest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\dataviewctrltest.cpp\r
+\r
+$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp\r
+\r
$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp\r
\r
$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp\r
\r
+$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp\r
+\r
$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp\r
\r
$(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp\r
\r
+$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp\r
+\r
$(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp\r
\r
+$(OBJS)\test_gui_webtest.obj: .\controls\webtest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\webtest.cpp\r
+\r
$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp\r
\r
$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp\r
\r
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp\r
+\r
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp\r
+\r
$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp\r
\r