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

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

diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat
index e49e321c2cda7d08c33b0e827e81d8cb3e69de67..44ff08c178c7bc18bd04acd45a37a45700bfa8c8 100644 (file)
--- a/contrib/build/net/makefile.wat
+++ b/contrib/build/net/makefile.wat
@@ -79,7 +79,7 @@ EXTRALIBS_FOR_BASE =
 __netutilsdll___depname =
 !ifeq SHARED 1
 __netutilsdll___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_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\net\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -260,12 +261,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)_netutils_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
 
 !ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll :  $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll :  $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
        @%create $(OBJS)\netutilsdll.lbc
        @%append $(OBJS)\netutilsdll.lbc option quiet
        @%append $(OBJS)\netutilsdll.lbc name $^@
@@ -274,7 +275,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
        @for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.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)\netutilsdll.lbc library %i
        @%append $(OBJS)\netutilsdll.lbc option resource=$(OBJS)\netutilsdll_version.res
-       @%append $(OBJS)\netutilsdll.lbc system nt_dll
+       @%append $(OBJS)\netutilsdll.lbc system nr_dll
        wlink @$(OBJS)\netutilsdll.lbc
        wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib +$^@
 !endif
@@ -287,29 +288,29 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 $(OBJS)\netutilsdll_dummy.obj :  .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
 
 $(OBJS)\netutilsdll_version.res :  .AUTODEPEND ../../src/net\..\..\..\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\net\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_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\net\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG) $<
 
 $(OBJS)\netutilsdll_email.obj :  .AUTODEPEND ../../src/net\email.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
 
 $(OBJS)\netutilsdll_smapi.obj :  .AUTODEPEND ../../src/net\smapi.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
 
 $(OBJS)\netutilsdll_web.obj :  .AUTODEPEND ../../src/net\web.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
 
 $(OBJS)\netutilslib_dummy.obj :  .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
 
 $(OBJS)\netutilslib_email.obj :  .AUTODEPEND ../../src/net\email.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
 
 $(OBJS)\netutilslib_smapi.obj :  .AUTODEPEND ../../src/net\smapi.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
 
 $(OBJS)\netutilslib_web.obj :  .AUTODEPEND ../../src/net\web.cpp
-       $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<