\r
### Conditionally set variables: ###\r
\r
-WIN32_TOOLKIT_LOWERCASE =\r
-!ifeq TOOLKIT GTK\r
-WIN32_TOOLKIT_LOWERCASE = gtk\r
-!endif\r
-!ifeq TOOLKIT MSW\r
-WIN32_TOOLKIT_LOWERCASE = msw\r
-!endif\r
PORTNAME =\r
!ifeq USE_GUI 0\r
PORTNAME = base\r
!endif\r
!ifeq USE_GUI 1\r
-PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)\r
-!endif\r
-WXBASEPORT =\r
-!ifeq TOOLKIT MAC\r
-WXBASEPORT = _carbon\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
!endif\r
COMPILER_VERSION =\r
!ifeq OFFICIAL_BUILD 1\r
!ifeq MONOLITHIC 1\r
EXTRALIBS_FOR_BASE = \r
!endif\r
-LIB_GTK =\r
-!ifeq TOOLKIT GTK\r
-!ifeq TOOLKIT_VERSION 2\r
-LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &\r
- gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &\r
- glib-2.0.lib\r
-!endif\r
-!endif\r
__LIB_PNG_IF_MONO_p =\r
!ifeq MONOLITHIC 1\r
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_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\r
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!endif\r
__LIB_TIFF_p =\r
!ifeq USE_GUI 1\r
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
__WXLIB_NET_p =\r
!ifeq MONOLITHIC 0\r
__WXLIB_NET_p = &\r
- wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
!endif\r
__WXLIB_XML_p =\r
!ifeq MONOLITHIC 0\r
__WXLIB_XML_p = &\r
- wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
!endif\r
__WXLIB_BASE_p =\r
!ifeq MONOLITHIC 0\r
__WXLIB_BASE_p = &\r
- wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
!endif\r
__WXLIB_MONO_p =\r
!ifeq MONOLITHIC 1\r
\r
### Variables: ###\r
\r
-WX_RELEASE_NODOT = 29\r
+WX_RELEASE_NODOT = 30\r
COMPILER_PREFIX = wat\r
OBJS = &\r
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
SETUPHDIR = &\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
- $(__RUNTIME_LIBS) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &\r
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &\r
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &\r
- -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
- -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 &\r
- $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) &\r
- $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+ $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
+ $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
+ $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &\r
+ /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
+ $(CXXFLAGS)\r
TEST_OBJECTS = &\r
$(OBJS)\test_dummy.obj &\r
$(OBJS)\test_test.obj &\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_xlocale.obj &\r
$(OBJS)\test_xmltest.obj\r
TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
- $(__RUNTIME_LIBS) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &\r
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &\r
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &\r
- -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
- -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH &\r
- $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) &\r
- $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+ $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
+ $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
+ $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $(CPPUNIT_CFLAGS) &\r
+ /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &\r
+ $(CPPFLAGS) $(CXXFLAGS)\r
TEST_GUI_OBJECTS = &\r
$(OBJS)\test_gui_dummy.obj &\r
$(OBJS)\test_gui_asserthelper.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
@%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_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) $(LIB_GTK) 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
\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
+ 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
$(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
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
\r
$(OBJS)\test_gui_sample.res : .AUTODEPEND .\..\samples\sample.rc\r
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<\r
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<\r
\r
$(OBJS)\test_gui_dummy.obj : .AUTODEPEND .\dummy.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\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
projects / wxWidgets.git / blobdiff