fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / contrib / build / deprecated / makefile.bcc

diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc
index fe3c234819d3dbd82bf26d300becaee485909a14..1b372e4d95f39ef29a282617aa8f344c3813c3dd 100644 (file)
--- a/contrib/build/deprecated/makefile.bcc
+++ b/contrib/build/deprecated/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -32,14 +32,14 @@ DEPRECATEDDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
+       -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\..\include \
        -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
        -I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
 DEPRECATEDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
+       -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\..\include \
        -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
        -I..\..\src\deprecated -Hu -H=$(OBJS)\wxprec_deprecateddll.csm $(CPPFLAGS) \
        $(CXXFLAGS)
@@ -57,14 +57,14 @@ DEPRECATEDLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
+       -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\..\include \
        -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CPPFLAGS) \
        $(CFLAGS)
 DEPRECATEDLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
+       -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\..\include \
        -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated -Hu \
        -H=$(OBJS)\wxprec_deprecatedlib.csm $(CPPFLAGS) $(CXXFLAGS)
 DEPRECATEDLIB_OBJECTS =  \
@@ -284,7 +284,7 @@ $(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) -H $**
 
 $(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i..\..\src\deprecated\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG) $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i..\..\src\deprecated\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG) $**
 
 $(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp
        $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**