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)\r
+LIBDIRNAME = \\r
+ .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
- $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \\r
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WX$(TOOLKIT)__ \\r
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
+ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \\r
$(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
$(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test.csm $(CPPFLAGS) $(CXXFLAGS)\r
TEST_OBJECTS = \\r
$(OBJS)\test_xlocale.obj \\r
$(OBJS)\test_xmltest.obj\r
TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
- $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \\r
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WX$(TOOLKIT)__ \\r
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \\r
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
+ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \\r
$(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -I.\..\samples -DNOPCH \\r
$(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test_gui.csm $(CPPFLAGS) \\r
$(CXXFLAGS)\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_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_propagation.obj \\r
$(OBJS)\test_gui_keyboard.obj \\r
\r
### Conditionally set variables: ###\r
\r
+!if "$(TOOLKIT)" == "GTK"\r
+WIN32_TOOLKIT_LOWERCASE = gtk\r
+!endif\r
+!if "$(TOOLKIT)" == "MSW"\r
+WIN32_TOOLKIT_LOWERCASE = msw\r
+!endif\r
!if "$(USE_GUI)" == "0"\r
PORTNAME = base\r
!endif\r
!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)\r
+!endif\r
+!if "$(TOOLKIT)" == "MAC"\r
+WXBASEPORT = _carbon\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
!endif\r
!if "$(BUILD)" == "debug"\r
WXDEBUGFLAG = d\r
EXTRALIBS_FOR_BASE = \r
!endif\r
!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE = \r
+EXTRALIBS_FOR_BASE = \r
+!endif\r
+!if "$(TOOLKIT)" == "GTK" && "$(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
!if "$(MONOLITHIC)" == "1"\r
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
!if "$(SHARED)" == "1"\r
__DLLFLAG_p_3 = -dWXUSINGDLL\r
!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_WEB_p = \\r
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_web.lib\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
!endif\r
!if "$(MONOLITHIC)" == "0"\r
__WXLIB_NET_p = \\r
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+ wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
__WXLIB_XML_p = \\r
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
+ wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
__WXLIB_BASE_p = \\r
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+ wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
!endif\r
!if "$(MONOLITHIC)" == "1"\r
__WXLIB_MONO_p = \\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
!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_WEB_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
+ 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) $(LIB_GTK) 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
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp\r
\r
$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc\r
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\samples -dNOPCH .\..\samples\sample.rc\r
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\samples -dNOPCH .\..\samples\sample.rc\r
\r
$(OBJS)\test_gui_dummy.obj: .\dummy.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp\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_richtextctrltest.obj: .\controls\richtextctrltest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp\r
\r
+$(OBJS)\test_gui_searchctrltest.obj: .\controls\searchctrltest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\searchctrltest.cpp\r
+\r
+$(OBJS)\test_gui_simplebooktest.obj: .\controls\simplebooktest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\simplebooktest.cpp\r
+\r
$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.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_windowtest.obj: .\controls\windowtest.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp\r
\r
+$(OBJS)\test_gui_dialogtest.obj: .\controls\dialogtest.cpp\r
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\dialogtest.cpp\r
+\r
$(OBJS)\test_gui_clone.obj: .\events\clone.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp\r
\r
projects / wxWidgets.git / blobdiff