blind fix for Borland ANSI build: define wxStructStat specially for this compiler

[wxWidgets.git] / tests / makefile.bcc

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 29dd9fb06dc669ab9d97cdff43a613d152302a9b..232de8819409e2626e5f4d41782e150ca03098e0 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -43,6 +43,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_tartest.obj \
        $(OBJS)\test_arrays.obj \
        $(OBJS)\test_base64.obj \
        $(OBJS)\test_tartest.obj \
        $(OBJS)\test_arrays.obj \
        $(OBJS)\test_base64.obj \

+       $(OBJS)\test_cmdlinetest.obj \

        $(OBJS)\test_fileconf.obj \
        $(OBJS)\test_datetimetest.obj \
        $(OBJS)\test_filekind.obj \
        $(OBJS)\test_fileconf.obj \
        $(OBJS)\test_datetimetest.obj \
        $(OBJS)\test_filekind.obj \


@@ -85,7 +86,9 @@ TEST_OBJECTS =  \
        $(OBJS)\test_uris.obj \
        $(OBJS)\test_vectors.obj \
        $(OBJS)\test_evtconnection.obj \
        $(OBJS)\test_uris.obj \
        $(OBJS)\test_vectors.obj \
        $(OBJS)\test_evtconnection.obj \

-       $(OBJS)\test_weakref.obj
+       $(OBJS)\test_weakref.obj \
+       $(OBJS)\test_xlocale.obj \
+       $(OBJS)\test_xmltest.obj

 TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \


@@ -100,7 +103,10 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_size.obj \
        $(OBJS)\test_gui_point.obj \
        $(OBJS)\test_gui_config.obj \
        $(OBJS)\test_gui_size.obj \
        $(OBJS)\test_gui_point.obj \
        $(OBJS)\test_gui_config.obj \

-       $(OBJS)\test_gui_textctrltest.obj
+       $(OBJS)\test_gui_textctrltest.obj \
+       $(OBJS)\test_gui_selstoretest.obj \
+       $(OBJS)\test_gui_clientsize.obj \
+       $(OBJS)\test_gui_setsize.obj

 PRINTFBENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 PRINTFBENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \


@@ -151,6 +157,10 @@ EXTRALIBS_FOR_BASE =
 __WXLIB_NET_p = \
        wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif
 __WXLIB_NET_p = \
        wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif

+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif

 !if "$(USE_GUI)" == "1"
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif
 !if "$(USE_GUI)" == "1"
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif


@@ -324,7 +334,7 @@ clean:
 
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|
 
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|

-       c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
+       c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,

 |
 
 !if "$(USE_GUI)" == "1"
 |
 
 !if "$(USE_GUI)" == "1"


@@ -368,6 +378,9 @@ $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
 $(OBJS)\test_base64.obj: .\base64\base64.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
 
 $(OBJS)\test_base64.obj: .\base64\base64.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
 

+$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
+

 $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
 
 $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
 


@@ -497,6 +510,12 @@ $(OBJS)\test_evtconnection.obj: .\weakref\evtconnection.cpp
 $(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
 
 $(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
 

+$(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xlocale\xlocale.cpp
+
+$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
+

 $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\include -i. $(__DLLFLAG_p_3) -i.\..\samples -dNOPCH .\..\samples\sample.rc
 
 $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\include -i. $(__DLLFLAG_p_3) -i.\..\samples -dNOPCH .\..\samples\sample.rc
 


@@ -521,6 +540,15 @@ $(OBJS)\test_gui_config.obj: .\config\config.cpp
 $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
 
 $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
 

+$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
+
+$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
+
+$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
+

 $(OBJS)\printfbench_dummy.obj: .\dummy.cpp
        $(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) -H .\dummy.cpp
 
 $(OBJS)\printfbench_dummy.obj: .\dummy.cpp
        $(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) -H .\dummy.cpp