PORTNAME = base\r
!endif\r
!ifeq USE_GUI 1\r
-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+COMPILER_VERSION =\r
+!ifeq OFFICIAL_BUILD 1\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
!endif\r
WXDEBUGFLAG =\r
!ifeq BUILD debug\r
EXTRALIBS_FOR_BASE = \r
!endif\r
!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE = \r
+EXTRALIBS_FOR_BASE = \r
!endif\r
__LIB_PNG_IF_MONO_p =\r
!ifeq MONOLITHIC 1\r
!ifeq USE_GUI 1\r
__test_gui___depname = $(OBJS)\test_gui.exe\r
!endif\r
+__WXLIB_WEBVIEW_p =\r
+!ifeq MONOLITHIC 0\r
+!ifeq USE_WEBVIEW 1\r
+__WXLIB_WEBVIEW_p = &\r
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+!endif\r
+!endif\r
__WXLIB_RICHTEXT_p =\r
!ifeq MONOLITHIC 0\r
__WXLIB_RICHTEXT_p = &\r
__WXLIB_CORE_p = &\r
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
!endif\r
+__LIB_SCINTILLA_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!endif
__LIB_TIFF_p =\r
!ifeq USE_GUI 1\r
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = wat\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)\r
+LIBDIRNAME = &\r
+ .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = &\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
$(OBJS)\test_regconf.obj &\r
$(OBJS)\test_datetimetest.obj &\r
$(OBJS)\test_evthandler.obj &\r
+ $(OBJS)\test_evtlooptest.obj &\r
$(OBJS)\test_evtsource.obj &\r
$(OBJS)\test_stopwatch.obj &\r
$(OBJS)\test_timertest.obj &\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 &
+ $(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 &
+ $(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_radiobuttontest.obj &\r
$(OBJS)\test_gui_rearrangelisttest.obj &\r
$(OBJS)\test_gui_richtextctrltest.obj &\r
+ $(OBJS)\test_gui_searchctrltest.obj &\r
+ $(OBJS)\test_gui_simplebooktest.obj &\r
$(OBJS)\test_gui_slidertest.obj &\r
$(OBJS)\test_gui_spinctrldbltest.obj &\r
$(OBJS)\test_gui_spinctrltest.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_dialogtest.obj &\r
$(OBJS)\test_gui_clone.obj &\r
+ $(OBJS)\test_gui_evtlooptest.obj &\r
$(OBJS)\test_gui_propagation.obj &\r
$(OBJS)\test_gui_keyboard.obj &\r
+ $(OBJS)\test_gui_exec.obj &\r
$(OBJS)\test_gui_fonttest.obj &\r
$(OBJS)\test_gui_image.obj &\r
$(OBJS)\test_gui_rawbmp.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 &
- $(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 &\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
$(OBJS)\test_gui_xrctest.obj\r
\r
\r
\r
### Targets: ###\r
\r
-all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data fr\r
+all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data data-images fr\r
\r
clean : .SYMBOLIC \r
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
@%append $(OBJS)\test_gui.lbc option caseexact\r
@%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
@for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i\r
- @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\r
+ @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\r
@%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res\r
@for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i\r
wlink @$(OBJS)\test_gui.lbc\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 : .SYMBOLIC \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 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\r
+\r
fr : .SYMBOLIC \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_evthandler.obj : .AUTODEPEND .\events\evthandler.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
\r
+$(OBJS)\test_evtlooptest.obj : .AUTODEPEND .\events\evtlooptest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
$(OBJS)\test_evtsource.obj : .AUTODEPEND .\events\evtsource.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_point.obj : .AUTODEPEND .\geometry\point.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_region.obj : .AUTODEPEND .\geometry\region.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_bitmap.obj : .AUTODEPEND .\graphics\bitmap.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_measuring.obj : .AUTODEPEND .\graphics\measuring.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
-$(OBJS)\test_gui_affinematrix.obj : .AUTODEPEND .\graphics\affinematrix.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_affinematrix.obj : .AUTODEPEND .\graphics\affinematrix.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_config.obj : .AUTODEPEND .\config\config.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_comboboxtest.obj : .AUTODEPEND .\controls\comboboxtest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_dataviewctrltest.obj : .AUTODEPEND .\controls\dataviewctrltest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_datepickerctrltest.obj : .AUTODEPEND .\controls\datepickerctrltest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_frametest.obj : .AUTODEPEND .\controls\frametest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_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_markuptest.obj : .AUTODEPEND .\controls\markuptest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_notebooktest.obj : .AUTODEPEND .\controls\notebooktest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_richtextctrltest.obj : .AUTODEPEND .\controls\richtextctrltest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_searchctrltest.obj : .AUTODEPEND .\controls\searchctrltest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_simplebooktest.obj : .AUTODEPEND .\controls\simplebooktest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_slidertest.obj : .AUTODEPEND .\controls\slidertest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_treectrltest.obj : .AUTODEPEND .\controls\treectrltest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_treelistctrltest.obj : .AUTODEPEND .\controls\treelistctrltest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_virtlistctrltest.obj : .AUTODEPEND .\controls\virtlistctrltest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_webtest.obj : .AUTODEPEND .\controls\webtest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_windowtest.obj : .AUTODEPEND .\controls\windowtest.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_dialogtest.obj : .AUTODEPEND .\controls\dialogtest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_clone.obj : .AUTODEPEND .\events\clone.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_evtlooptest.obj : .AUTODEPEND .\events\evtlooptest.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_propagation.obj : .AUTODEPEND .\events\propagation.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_keyboard.obj : .AUTODEPEND .\events\keyboard.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
+$(OBJS)\test_gui_exec.obj : .AUTODEPEND .\exec\exec.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_fonttest.obj : .AUTODEPEND .\font\fonttest.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
- $(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\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_wrapsizer.obj : .AUTODEPEND .\sizers\wrapsizer.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_toplevel.obj : .AUTODEPEND .\toplevel\toplevel.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_valnum.obj : .AUTODEPEND .\validators\valnum.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
$(OBJS)\test_gui_clientsize.obj : .AUTODEPEND .\window\clientsize.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
projects / wxWidgets.git / blobdiff