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

[wxWidgets.git] / contrib / build / ogl / makefile.wat

diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat
index 7f9295013ab63f627cc7a9d3fb0cdb528268eb7a..ea5be9892fe9dae3bb21ea9a6184d8120a81904f 100644 (file)
--- a/contrib/build/ogl/makefile.wat
+++ b/contrib/build/ogl/makefile.wat
@@ -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!
 # =========================================================================
 
@@ -79,7 +79,7 @@ EXTRALIBS_FOR_BASE =
 __ogldll___depname =
 !ifeq SHARED 1
 __ogldll___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
 !endif
 __DEBUGINFO_2 =
 !ifeq BUILD debug
@@ -214,7 +214,8 @@ __UNICODE_DEFINE_p = -d_UNICODE
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 27
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -223,7 +224,7 @@ SETUPHDIR = &
 OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -wx &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include -wx &
        -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\ogl\..\..\include &
        -dWXUSINGDLL -dWXMAKINGDLL_OGL /fh=$(OBJS)\wxprec_ogldll.pch $(__RTTIFLAG) &
        $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
@@ -244,7 +245,7 @@ OGLDLL_OBJECTS =  &
 OGLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -wx &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include -wx &
        -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\ogl\..\..\include &
        /fh=$(OBJS)\wxprec_ogllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
        $(CXXFLAGS)
@@ -278,12 +279,12 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
 
 !ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll :  $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll :  $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
        @%create $(OBJS)\ogldll.lbc
        @%append $(OBJS)\ogldll.lbc option quiet
        @%append $(OBJS)\ogldll.lbc name $^@
@@ -305,83 +306,83 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 $(OBJS)\ogldll_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_version.res :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\version.rc
-       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<
+       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<
 
 $(OBJS)\ogldll_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
-       $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogllib_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<