X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9bb9964e261781d575353864cc027b3ca8ba445e..e90d566109362e04b65394a0c053f33f156bdaaf:/tests/makefile.wat?ds=sidebyside diff --git a/tests/makefile.wat b/tests/makefile.wat index 7c563fdaae..ff8e120442 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -36,7 +36,11 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = msw$(TOOLKIT_VERSION) +!endif +COMPILER_VERSION = +!ifeq OFFICIAL_BUILD 1 +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -66,7 +70,7 @@ EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE = !endif !ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif __LIB_PNG_IF_MONO_p = !ifeq MONOLITHIC 1 @@ -76,6 +80,13 @@ __test_gui___depname = !ifeq USE_GUI 1 __test_gui___depname = $(OBJS)\test_gui.exe !endif +__WXLIB_WEBVIEW_p = +!ifeq MONOLITHIC 0 +!ifeq USE_WEBVIEW 1 +__WXLIB_WEBVIEW_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib +!endif +!endif __WXLIB_RICHTEXT_p = !ifeq MONOLITHIC 0 __WXLIB_RICHTEXT_p = & @@ -108,6 +119,12 @@ __WXLIB_CORE_p = __WXLIB_CORE_p = & wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif +__LIB_SCINTILLA_IF_MONO_p = +!ifeq MONOLITHIC 1 +!ifeq USE_STC 1 +__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib +!endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -259,11 +276,12 @@ __DLLFLAG_p = -dWXUSINGDLL ### Variables: ### -WX_RELEASE_NODOT = 29 +WX_RELEASE_NODOT = 30 COMPILER_PREFIX = wat OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = & + .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & @@ -288,6 +306,7 @@ TEST_OBJECTS = & $(OBJS)\test_regconf.obj & $(OBJS)\test_datetimetest.obj & $(OBJS)\test_evthandler.obj & + $(OBJS)\test_evtlooptest.obj & $(OBJS)\test_evtsource.obj & $(OBJS)\test_stopwatch.obj & $(OBJS)\test_timertest.obj & @@ -375,10 +394,12 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_rect.obj & $(OBJS)\test_gui_size.obj & $(OBJS)\test_gui_point.obj & + $(OBJS)\test_gui_region.obj & $(OBJS)\test_gui_bitmap.obj & $(OBJS)\test_gui_colour.obj & $(OBJS)\test_gui_ellipsization.obj & $(OBJS)\test_gui_measuring.obj & + $(OBJS)\test_gui_affinematrix.obj & $(OBJS)\test_gui_config.obj & $(OBJS)\test_gui_bitmapcomboboxtest.obj & $(OBJS)\test_gui_bitmaptogglebuttontest.obj & @@ -389,6 +410,8 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_choicebooktest.obj & $(OBJS)\test_gui_choicetest.obj & $(OBJS)\test_gui_comboboxtest.obj & + $(OBJS)\test_gui_dataviewctrltest.obj & + $(OBJS)\test_gui_datepickerctrltest.obj & $(OBJS)\test_gui_frametest.obj & $(OBJS)\test_gui_gaugetest.obj & $(OBJS)\test_gui_gridtest.obj & @@ -402,7 +425,7 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_listboxtest.obj & $(OBJS)\test_gui_listctrltest.obj & $(OBJS)\test_gui_listviewtest.obj & - $(OBJS)\test_gui_markuptest.obj & + $(OBJS)\test_gui_markuptest.obj & $(OBJS)\test_gui_notebooktest.obj & $(OBJS)\test_gui_ownerdrawncomboboxtest.obj & $(OBJS)\test_gui_pickerbasetest.obj & @@ -411,6 +434,8 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_radiobuttontest.obj & $(OBJS)\test_gui_rearrangelisttest.obj & $(OBJS)\test_gui_richtextctrltest.obj & + $(OBJS)\test_gui_searchctrltest.obj & + $(OBJS)\test_gui_simplebooktest.obj & $(OBJS)\test_gui_slidertest.obj & $(OBJS)\test_gui_spinctrldbltest.obj & $(OBJS)\test_gui_spinctrltest.obj & @@ -420,11 +445,16 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_toolbooktest.obj & $(OBJS)\test_gui_treebooktest.obj & $(OBJS)\test_gui_treectrltest.obj & + $(OBJS)\test_gui_treelistctrltest.obj & $(OBJS)\test_gui_virtlistctrltest.obj & + $(OBJS)\test_gui_webtest.obj & $(OBJS)\test_gui_windowtest.obj & + $(OBJS)\test_gui_dialogtest.obj & $(OBJS)\test_gui_clone.obj & + $(OBJS)\test_gui_evtlooptest.obj & $(OBJS)\test_gui_propagation.obj & $(OBJS)\test_gui_keyboard.obj & + $(OBJS)\test_gui_exec.obj & $(OBJS)\test_gui_fonttest.obj & $(OBJS)\test_gui_image.obj & $(OBJS)\test_gui_rawbmp.obj & @@ -435,13 +465,14 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_guifuncs.obj & $(OBJS)\test_gui_selstoretest.obj & $(OBJS)\test_gui_garbage.obj & - $(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_settings.obj & + $(OBJS)\test_gui_socket.obj & + $(OBJS)\test_gui_boxsizer.obj & + $(OBJS)\test_gui_wrapsizer.obj & + $(OBJS)\test_gui_toplevel.obj & + $(OBJS)\test_gui_valnum.obj & + $(OBJS)\test_gui_clientsize.obj & + $(OBJS)\test_gui_setsize.obj & $(OBJS)\test_gui_xrctest.obj @@ -451,7 +482,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data fr +all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data data-images fr clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -482,7 +513,7 @@ $(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res @%append $(OBJS)\test_gui.lbc option caseexact @%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i - @for %i in ( $(__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) $(__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_gui.lbc library %i + @for %i in ( $(__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_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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_gui.lbc library %i @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i wlink @$(OBJS)\test_gui.lbc @@ -492,6 +523,10 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) 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) +data-images : .SYMBOLIC + if not exist image mkdir image + for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%f copy .\image\%f image + fr : .SYMBOLIC if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr @@ -535,6 +570,9 @@ $(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp $(OBJS)\test_evthandler.obj : .AUTODEPEND .\events\evthandler.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< +$(OBJS)\test_evtlooptest.obj : .AUTODEPEND .\events\evtlooptest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(OBJS)\test_evtsource.obj : .AUTODEPEND .\events\evtsource.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< @@ -772,6 +810,9 @@ $(OBJS)\test_gui_size.obj : .AUTODEPEND .\geometry\size.cpp $(OBJS)\test_gui_point.obj : .AUTODEPEND .\geometry\point.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_region.obj : .AUTODEPEND .\geometry\region.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_bitmap.obj : .AUTODEPEND .\graphics\bitmap.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< @@ -784,6 +825,9 @@ $(OBJS)\test_gui_ellipsization.obj : .AUTODEPEND .\graphics\ellipsization.cpp $(OBJS)\test_gui_measuring.obj : .AUTODEPEND .\graphics\measuring.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_affinematrix.obj : .AUTODEPEND .\graphics\affinematrix.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_config.obj : .AUTODEPEND .\config\config.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< @@ -814,6 +858,12 @@ $(OBJS)\test_gui_choicetest.obj : .AUTODEPEND .\controls\choicetest.cpp $(OBJS)\test_gui_comboboxtest.obj : .AUTODEPEND .\controls\comboboxtest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_dataviewctrltest.obj : .AUTODEPEND .\controls\dataviewctrltest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + +$(OBJS)\test_gui_datepickerctrltest.obj : .AUTODEPEND .\controls\datepickerctrltest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_frametest.obj : .AUTODEPEND .\controls\frametest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< @@ -853,9 +903,9 @@ $(OBJS)\test_gui_listctrltest.obj : .AUTODEPEND .\controls\listctrltest.cpp $(OBJS)\test_gui_listviewtest.obj : .AUTODEPEND .\controls\listviewtest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< -$(OBJS)\test_gui_markuptest.obj : .AUTODEPEND .\controls\markuptest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< - +$(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 $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< @@ -880,6 +930,12 @@ $(OBJS)\test_gui_rearrangelisttest.obj : .AUTODEPEND .\controls\rearrangelistte $(OBJS)\test_gui_richtextctrltest.obj : .AUTODEPEND .\controls\richtextctrltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_searchctrltest.obj : .AUTODEPEND .\controls\searchctrltest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + +$(OBJS)\test_gui_simplebooktest.obj : .AUTODEPEND .\controls\simplebooktest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_slidertest.obj : .AUTODEPEND .\controls\slidertest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< @@ -907,21 +963,36 @@ $(OBJS)\test_gui_treebooktest.obj : .AUTODEPEND .\controls\treebooktest.cpp $(OBJS)\test_gui_treectrltest.obj : .AUTODEPEND .\controls\treectrltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_treelistctrltest.obj : .AUTODEPEND .\controls\treelistctrltest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_virtlistctrltest.obj : .AUTODEPEND .\controls\virtlistctrltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_webtest.obj : .AUTODEPEND .\controls\webtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_windowtest.obj : .AUTODEPEND .\controls\windowtest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_dialogtest.obj : .AUTODEPEND .\controls\dialogtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_clone.obj : .AUTODEPEND .\events\clone.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_evtlooptest.obj : .AUTODEPEND .\events\evtlooptest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_propagation.obj : .AUTODEPEND .\events\propagation.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(OBJS)\test_gui_keyboard.obj : .AUTODEPEND .\events\keyboard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_exec.obj : .AUTODEPEND .\exec\exec.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_fonttest.obj : .AUTODEPEND .\font\fonttest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< @@ -958,15 +1029,18 @@ $(OBJS)\test_gui_settings.obj : .AUTODEPEND .\misc\settings.cpp $(OBJS)\test_gui_socket.obj : .AUTODEPEND .\net\socket.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< -$(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_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_toplevel.obj : .AUTODEPEND .\toplevel\toplevel.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 $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<