define _HPUX_SOURCE under HP-UX, otherwise many things are not defined in standard...

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

diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat
index 7f9295013ab63f627cc7a9d3fb0cdb528268eb7a..ebb38411048c54a67aa2b8986c7565c656358999 100644 (file)
--- a/contrib/build/ogl/makefile.wat
+++ b/contrib/build/ogl/makefile.wat
@@ -79,7 +79,7 @@ EXTRALIBS_FOR_BASE =
 __ogldll___depname =
 !ifeq SHARED 1
 __ogldll___depname = &
 __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
 !endif
 __DEBUGINFO_2 =
 !ifeq BUILD debug


@@ -214,7 +214,8 @@ __UNICODE_DEFINE_p = -d_UNICODE
 
 ### Variables: ###
 
 
 ### 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)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)


@@ -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 $(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
        -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 $^@
        @%create $(OBJS)\ogldll.lbc
        @%append $(OBJS)\ogldll.lbc option quiet
        @%append $(OBJS)\ogldll.lbc name $^@


@@ -292,7 +293,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
        @for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
        @for %i in ( $(__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)  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 odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
        @%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res
        @for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
        @for %i in ( $(__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)  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 odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
        @%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res

-       @%append $(OBJS)\ogldll.lbc system nt_dll
+       @%append $(OBJS)\ogldll.lbc system nr_dll

        wlink @$(OBJS)\ogldll.lbc
        wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib +$^@
 !endif
        wlink @$(OBJS)\ogldll.lbc
        wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib +$^@
 !endif


@@ -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
 !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
 
 $(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=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<

 
 $(OBJS)\ogldll_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(OBJS)\ogllib_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp

-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<